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/SaveRoomCreateFeeCmd.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
index 04f3083..fe1c071 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveRoomCreateFeeCmd.java
@@ -83,6 +83,14 @@
Assert.hasKeyAndValue(reqJson, "locationObjId", "鏈寘鍚敹璐瑰璞�");
Assert.hasKeyAndValue(reqJson, "configId", "鏈寘鍚敹璐归」鐩�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴稩D");
+ Assert.hasKeyAndValue(reqJson, "startTime", "鏈寘鍚璐硅捣濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "鏈寘鍚璐圭粨鏉熸椂闂�");
+
+ String endTime = reqJson.getString("endTime");
+ if (!endTime.contains(":")) {
+ endTime += " 23:59:59";
+ reqJson.put("endTime", endTime);
+ }
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
@@ -92,18 +100,6 @@
reqJson.put("feeTypeCd", feeConfigDtos.get(0).getFeeTypeCd());
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;
-
- endTime = DateUtil.getDateFromStringB(reqJson.getString("endTime"));
- configEndTime = DateUtil.getDateFromStringA(feeConfigDtos.get(0).getEndTime());
- if (endTime.getTime() > configEndTime.getTime()) {
- throw new IllegalArgumentException("缁撴潫鏃堕棿涓嶈兘瓒呰繃璐圭敤椤规椂闂�");
- }
- }
if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeConfigDtos.get(0).getComputingFormula())) {
Assert.hasKeyAndValue(reqJson, "rateCycle", "鏈寘鍚�掑鍛ㄦ湡");
@@ -169,10 +165,12 @@
return;
}
+ feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson,
+ context,
+ FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ reqJson.getString("endTime")));
+
if (!StringUtil.isEmpty(roomDto.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, roomDto.getOwnerId()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, roomDto.getLink()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, roomDto.getOwnerName()));
--
Gitblit v1.8.0