From ae2427a653555b7e32a417464289beef65e1c0a5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 21 六月 2022 00:12:59 +0800
Subject: [PATCH] 优化bug
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 1330f50..8581215 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -5,7 +5,7 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
@@ -29,7 +29,7 @@
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
-import com.java110.intf.feeAccountDetail.IFeeAccountDetailServiceSMO;
+import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.accountDetail.AccountDetailPo;
import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
@@ -58,7 +58,7 @@
import java.util.*;
@Java110Cmd(serviceCode = "fee.payFee")
-public class PayFeeCmd extends AbstractServiceCmdListener {
+public class PayFeeCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(PayFeeCmd.class);
@@ -164,8 +164,8 @@
if (feeConfigDtos != null && feeConfigDtos.size() == 1) {
try {
Date configEndTime = DateUtil.getDateFromString(feeConfigDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A);
-
- Date newDate = DateUtil.stepMonth(endTime, reqJson.getInteger("cycles") - 1);
+ configEndTime = DateUtil.stepDay(configEndTime,5);
+ Date newDate = DateUtil.stepMonth(endTime, reqJson.getInteger("cycles"));
if (newDate.getTime() > configEndTime.getTime()) {
throw new IllegalArgumentException("缂磋垂鍛ㄦ湡瓒呰繃 缂磋垂缁撴潫鏃堕棿");
@@ -333,16 +333,16 @@
}
}
- //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
+// //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
- feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
- List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
-
- if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
- cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
- return;
- }
+// feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
+// List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
+//
+// if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
+// cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
+// return;
+// }
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
}
@@ -521,6 +521,7 @@
JSONObject businessFeeDetail = new JSONObject();
businessFeeDetail.putAll(paramInJson);
businessFeeDetail.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
+ paramInJson.put("detailId", businessFeeDetail.getString("detailId"));
//鏀粯鏂瑰紡
businessFeeDetail.put("primeRate", paramInJson.getString("primeRate"));
//璁＄畻 搴旀敹閲戦
--
Gitblit v1.8.0