From 09095d67f2e2acf45dcd55155da491e44206db4e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 05 四月 2024 15:38:14 +0800
Subject: [PATCH] 修改时间 将时间修改 未23:59:59秒
---
service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
index c65163c..320ce43 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveParkingSpaceCreateFeeCmd.java
@@ -78,7 +78,14 @@
Assert.hasKeyAndValue(reqJson, "locationObjId", "鏈寘鍚敹璐瑰璞�");
Assert.hasKeyAndValue(reqJson, "configId", "鏈寘鍚敹璐归」鐩�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴稩D");
- //Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚垂鐢ㄨ捣濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚垂鐢ㄨ捣濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "鏈寘鍚垂鐢ㄧ粨鏉熸椂闂�");
+
+ String endTime = reqJson.getString("endTime");
+ if (!endTime.contains(":")) {
+ endTime += " 23:59:59";
+ reqJson.put("endTime", endTime);
+ }
}
@Override
@@ -93,19 +100,6 @@
reqJson.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
reqJson.put("configEndTime", feeConfigDtos.get(0).getEndTime());
- if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && reqJson.containsKey("endTime")) {
- Date endTime = null;
- Date configEndTime = null;
- try {
- endTime = DateUtil.getDateFromString(reqJson.getString("endTime"), DateUtil.DATE_FORMATE_STRING_B);
- configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
- if (endTime.getTime() > configEndTime.getTime()) {
- throw new IllegalArgumentException("缁撴潫鏃堕棿涓嶈兘瓒呰繃璐圭敤椤规椂闂�");
- }
- } catch (ParseException e) {
- throw new IllegalArgumentException("缁撴潫鏃堕棿閿欒" + reqJson.getString("endTime"));
- }
- }
//鐢熸垚鎵规
generatorBatch(reqJson);
//鍒ゆ柇鏀惰垂鑼冨洿
@@ -224,11 +218,9 @@
for (int ownerCarIndex = 0; ownerCarIndex < ownerCarDtos.size(); ownerCarIndex++) {
curFailRoomCount++;
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addFee(ownerCarDtos.get(ownerCarIndex), reqJson, context), PayFeePo.class));
+ feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ reqJson.getString("endTime")));
if (!StringUtil.isEmpty(ownerCarDtos.get(ownerCarIndex).getOwnerId())) {
- if (!FeeDto.FEE_FLAG_CYCLE.equals(reqJson.getString("feeFlag"))) {
- feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
- reqJson.containsKey("endTime") ? reqJson.getString("endTime") : reqJson.getString("configEndTime")));
- }
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_ID, ownerCarDtos.get(ownerCarIndex).getOwnerId()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, ownerCarDtos.get(ownerCarIndex).getLink()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, ownerCarDtos.get(ownerCarIndex).getOwnerName()));
--
Gitblit v1.8.0