From 1ac555ce49a45e2c7fc015dbb16b104840788c21 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期一, 18 八月 2025 11:51:42 +0800
Subject: [PATCH] 费用导入修复2025/08/15
---
service-fee/src/main/java/com/java110/fee/cmd/payFeeRule/DeletePayFeeRuleCmd.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/payFeeRule/DeletePayFeeRuleCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/payFeeRule/DeletePayFeeRuleCmd.java
index 2c23772..80b7309 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/payFeeRule/DeletePayFeeRuleCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/payFeeRule/DeletePayFeeRuleCmd.java
@@ -18,12 +18,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.Environment;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.payFee.PayFeeRuleBillDto;
+import com.java110.fee.feeMonth.IPayFeeMonth;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeRuleBillV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeRuleV1InnerServiceSMO;
-import com.java110.po.payFeeRule.PayFeeRulePo;
+import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
+import com.java110.po.fee.PayFeeDetailPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.payFee.PayFeeRulePo;
+import com.java110.po.payFee.PayFeeRuleBillPo;
+import com.java110.po.reportFee.ReportOweFeePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +41,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
* 绫昏〃杩帮細鍒犻櫎
@@ -49,8 +61,24 @@
@Autowired
private IPayFeeRuleV1InnerServiceSMO payFeeRuleV1InnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeRuleBillV1InnerServiceSMO payFeeRuleBillV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
+
+ @Autowired
+ private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+ Environment.isDevEnv();
Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
@@ -67,6 +95,45 @@
throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
}
+ //todo 鏌ヨ璐﹀崟璐圭敤
+ PayFeeRuleBillDto payFeeRuleBillDto = new PayFeeRuleBillDto();
+ payFeeRuleBillDto.setRuleId(reqJson.getString("ruleId"));
+ payFeeRuleBillDto.setCommunityId(reqJson.getString("communityId"));
+ List<PayFeeRuleBillDto> ruleBillDtos = payFeeRuleBillV1InnerServiceSMOImpl.queryPayFeeRuleBills(payFeeRuleBillDto);
+
+ if (ruleBillDtos == null || ruleBillDtos.isEmpty()) {
+ return;
+ }
+ PayFeeRuleBillPo payFeeRuleBillPo = null;
+ //todo 鍒犻櫎 璐﹀崟
+ payFeeRuleBillPo = new PayFeeRuleBillPo();
+ payFeeRuleBillPo.setRuleId(reqJson.getString("ruleId"));
+ payFeeRuleBillV1InnerServiceSMOImpl.deletePayFeeRuleBill(payFeeRuleBillPo);
+
+ PayFeePo payFeePo = null;
+ PayFeeDetailPo payFeeDetailPo = null;
+ for (PayFeeRuleBillDto tmpPayFeeRuleBillDto : ruleBillDtos) {
+ payFeePo = new PayFeePo();
+ payFeePo.setFeeId(tmpPayFeeRuleBillDto.getFeeId());
+ payFeePo.setCommunityId(tmpPayFeeRuleBillDto.getCommunityId());
+ payFeeV1InnerServiceSMOImpl.deletePayFee(payFeePo);
+
+ payFeeDetailPo = new PayFeeDetailPo();
+ payFeeDetailPo.setFeeId(tmpPayFeeRuleBillDto.getFeeId());
+ payFeeDetailPo.setCommunityId(tmpPayFeeRuleBillDto.getCommunityId());
+
+ payFeeDetailV1InnerServiceSMOImpl.deletePayFeeDetailNew(payFeeDetailPo);
+
+ // todo 鍒犻櫎娆犺垂淇℃伅
+ ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
+ reportOweFeePo.setFeeId(payFeePo.getFeeId());
+ reportOweFeePo.setCommunityId(payFeePo.getCommunityId());
+ reportOweFeeInnerServiceSMOImpl.deleteReportOweFee(reportOweFeePo);
+
+ //todo 绂绘暎鐨勬湀
+ payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
+ }
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0