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/RoomCreatePayFeeCmd.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/RoomCreatePayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/RoomCreatePayFeeCmd.java
index 079eccc..63ec5c7 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/RoomCreatePayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/RoomCreatePayFeeCmd.java
@@ -21,6 +21,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
@@ -54,6 +55,13 @@
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
Assert.hasKeyAndValue(reqJson, "configId", "鏈寘鍚敹璐归」鐩�");
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"));
@@ -69,19 +77,8 @@
}
JSONArray roomIds = reqJson.getJSONArray("roomIds");
- if (roomIds == null || roomIds.isEmpty()) {
+ if (ListUtil.isNull(roomIds)) {
throw new IllegalArgumentException("鏈寘鍚埧灞�");
- }
- //todo 涓嶆槸鍛ㄦ湡鎬ц垂鐢� endTime 蹇呴』瀛樺湪
- if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
- Assert.hasKeyAndValue(reqJson, "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("缁撴潫鏃堕棿涓嶈兘瓒呰繃璐圭敤椤规椂闂�");
- }
}
//todo 鍔ㄦ�佽垂鐢�
@@ -109,20 +106,6 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
//todo 鐢熸垚鎵规
- generatorBatch(reqJson);
-
-
- //todo 浜ょ粰databus 寮傛鏂瑰紡澶勭悊锛屽悓姝ユ柟寮忓鐞嗗緢瀹规槗瓒呮椂
- dataBusInnerServiceSMOImpl.databusData(new DatabusDataDto(DatabusDataDto.BUSINESS_TYPE_ROOM_CREATE_PAY_FEE, reqJson));
-
- }
-
- /**
- * 鐢熸垚鎵规鍙�
- *
- * @param reqJson
- */
- private void generatorBatch(JSONObject reqJson) {
PayFeeBatchPo payFeeBatchPo = new PayFeeBatchPo();
payFeeBatchPo.setBatchId(GenerateCodeFactory.getGeneratorId("12"));
payFeeBatchPo.setCommunityId(reqJson.getString("communityId"));
@@ -141,5 +124,11 @@
}
reqJson.put("batchId", payFeeBatchPo.getBatchId());
+
+
+ //todo 浜ょ粰databus 寮傛鏂瑰紡澶勭悊锛屽悓姝ユ柟寮忓鐞嗗緢瀹规槗瓒呮椂
+ dataBusInnerServiceSMOImpl.databusData(new DatabusDataDto(DatabusDataDto.BUSINESS_TYPE_ROOM_CREATE_PAY_FEE, reqJson));
+
}
+
}
--
Gitblit v1.8.0