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/SaveContractCreateFeeCmd.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
index f561116..4512b2a 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/SaveContractCreateFeeCmd.java
@@ -25,10 +25,7 @@
import com.java110.po.fee.PayFeePo;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -75,7 +72,14 @@
// super.validatePageInfo(pd);
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
Assert.hasKeyAndValue(reqJson, "configId", "鏈寘鍚敹璐归」鐩�");
- //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);
+ }
//Assert.hasKeyAndValue(reqJson, "billType", "鏈寘鍚嚭璐︾被鍨�");
//Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴稩D");
}
@@ -176,16 +180,13 @@
for (int roomIndex = 0; roomIndex < contractDtos.size(); roomIndex++) {
curFailRoomCount++;
feePos.add(BeanConvertUtil.covertBean(feeBMOImpl.addContractFee(contractDtos.get(roomIndex), reqJson, context), PayFeePo.class));
+ feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
+ reqJson.getString("endTime")));
if (!StringUtil.isEmpty(contractDtos.get(roomIndex).getObjId())) {
- 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, contractDtos.get(roomIndex).getObjId()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_LINK, contractDtos.get(roomIndex).getbLink()));
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_OWNER_NAME, contractDtos.get(roomIndex).getPartyB()));
}
-
//浠樿垂瀵硅薄鍚嶇О
feeAttrsPos.add(feeBMOImpl.addFeeAttr(reqJson, context, FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME,
contractDtos.get(roomIndex).getContractName()));
@@ -201,7 +202,7 @@
}
}
}
- if (feePos != null && feePos.size() > 0) {
+ if (!ListUtil.isNull(feePos)) {
saveFlag = saveFeeAndAttrs(feePos, feeAttrsPos);
if (saveFlag < 1) {
failRooms += curFailRoomCount;
@@ -212,7 +213,7 @@
paramOut.put("successRoom", contractDtos.size() - failRooms);
paramOut.put("errorRoom", failRooms);
- context.setResponseEntity( ResultVo.createResponseEntity(paramOut));
+ context.setResponseEntity(ResultVo.createResponseEntity(paramOut));
}
--
Gitblit v1.8.0