From fef2c4d637ca36cd8379b98d1e54d68a7a0536b0 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 29 八月 2025 12:05:45 +0800
Subject: [PATCH] 暂存0829
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
index 836e07c..9e18cf1 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
@@ -7,11 +7,15 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.fee.FeeDto;
import com.java110.fee.bmo.IQueryOweFee;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+
+import java.util.List;
@Java110Cmd(serviceCode = "/feeApi/listFeeObj")
public class ListFeeObjCmd extends Cmd {
@@ -19,6 +23,8 @@
@Autowired
private IQueryOweFee queryOweFeeImpl;
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
@@ -29,17 +35,30 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
FeeDto feeDto = new FeeDto();
feeDto.setFeeId(reqJson.getString("feeId"));
+ feeDto.setIsContractFee(reqJson.containsKey("isContractFee")?"O":null);
feeDto.setCommunityId(reqJson.getString("communityId"));
if (reqJson.containsKey("cycle") && !StringUtil.isEmpty(reqJson.getString("cycle"))) {
feeDto.setCycle(reqJson.getString("cycle"));
}
if (reqJson.containsKey("custEndTime") && !StringUtil.isEmpty(reqJson.getString("custEndTime"))) {
feeDto.setCustEndTime(reqJson.getString("custEndTime"));
+ feeDto.setPayEndDate(DateUtil.getDateFromStringB(feeDto.getCustEndTime()));
}
if("105".equals(reqJson.getString("cycle"))){
feeDto.setCustomStartTime(reqJson.getString("customStartTime"));
feeDto.setCustomEndTime(reqJson.getString("customEndTime"));
+ feeDto.setPayEndDate(DateUtil.getDateFromStringB(feeDto.getCustomEndTime()));
+ }
+
+ if("103".equals(reqJson.getString("cycle"))){
+ FeeDto feeDto1 = new FeeDto();
+ feeDto1.setFeeId(reqJson.getString("feeId"));
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto1);
+
+ feeDto.setCustomStartTime(DateUtil.getFormatTimeStringB(feeDtos.get(0).getEndTime()));
+ feeDto.setCustomEndTime(reqJson.getString("custEndTime"));
+ feeDto.setPayEndDate(DateUtil.getDateFromStringB(feeDto.getCustomEndTime()));
}
ResponseEntity<String> result = queryOweFeeImpl.listFeeObj(feeDto);
--
Gitblit v1.8.0