From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteFeeCmd.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteFeeCmd.java
index 97b5cfd..caaedd9 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/DeleteFeeCmd.java
@@ -2,18 +2,22 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+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.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
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.reportFee.ReportOweFeePo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -40,9 +44,16 @@
@Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
+
+ @Autowired
+ private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
- // super.validatePageInfo(pd);
+ Environment.isDevEnv();
+
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
Assert.hasKeyAndValue(reqJson, "feeId", "鏈寘鍚玣eeId");
@@ -54,9 +65,6 @@
Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅 鎴栨煡璇㈠埌澶氭潯" + reqJson);
-// if ("T".equals(feeDtos.get(0).getIsDefault())) {
-// throw new IllegalArgumentException("褰撳墠璐圭敤涓洪粯璁よ垂鐢ㄤ笉鑳藉仛鍒犻櫎");
-// }
String feeValidate = MappingCache.getValue("DELETE_FEE_VALIDATE");
if ("ON".equals(feeValidate)) {
@@ -84,11 +92,26 @@
PayFeePo payFeePo = BeanConvertUtil.covertBean(businessUnit, PayFeePo.class);
int flag = payFeeV1InnerServiceSMOImpl.deletePayFee(payFeePo);
-
- PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessUnit, PayFeeDetailPo.class);
- int flag2 = payFeeDetailV1InnerServiceSMOImpl.deletePayFeeDetailNew(payFeeDetailPo);
- if (flag < 1 || flag2 < 1) {
+ if (flag < 1) {
throw new IllegalArgumentException("鍒犻櫎澶辫触");
}
+
+ PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessUnit, PayFeeDetailPo.class);
+ List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(BeanConvertUtil.covertBean(payFeeDetailPo, FeeDetailDto.class));
+ if(feeDetailDtos != null && feeDetailDtos.size() > 0) {
+ int flag2 = payFeeDetailV1InnerServiceSMOImpl.deletePayFeeDetailNew(payFeeDetailPo);
+ if (flag2 < 1) {
+ throw new IllegalArgumentException("鍒犻櫎澶辫触");
+ }
+ }
+
+ // todo 鍒犻櫎娆犺垂淇℃伅
+ ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
+ reportOweFeePo.setFeeId(payFeePo.getFeeId());
+ reportOweFeePo.setCommunityId(payFeePo.getCommunityId());
+ reportOweFeeInnerServiceSMOImpl.deleteReportOweFee(reportOweFeePo);
+
+ //todo 绂绘暎鐨勬湀
+ payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
}
}
--
Gitblit v1.8.0