From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +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 | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 29d851c..94b72f5 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
@@ -7,10 +7,13 @@
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.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
@@ -33,7 +36,13 @@
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
@Autowired
+ private IPayFeeDetailV1InnerServiceSMO payFeeDetailV1InnerServiceSMOImpl;
+
+ @Autowired
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -49,9 +58,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)) {
@@ -82,5 +88,17 @@
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 绂绘暎鐨勬湀
+ payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
}
}
--
Gitblit v1.8.0