From 22af580b148c675f25bda8a8ff599f679b497fbd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 十二月 2022 22:08:14 +0800
Subject: [PATCH] 优化积分核销功能

---
 service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java
index 8f4bbf0..0537941 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java
@@ -22,7 +22,11 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.couponRuleFee.CouponRuleFeeDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.integralRuleFee.IntegralRuleFeeDto;
 import com.java110.intf.acct.IIntegralRuleFeeV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.po.integralRuleFee.IntegralRuleFeePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -31,6 +35,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 /**
  * 绫昏〃杩帮細淇濆瓨
@@ -52,24 +58,38 @@
     @Autowired
     private IIntegralRuleFeeV1InnerServiceSMO integralRuleFeeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ruleId", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleId");
         Assert.hasKeyAndValue(reqJson, "feeConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeConfigId");
-        Assert.hasKeyAndValue(reqJson, "feeConfigName", "璇锋眰鎶ユ枃涓湭鍖呭惈feeConfigName");
         Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
         Assert.hasKeyAndValue(reqJson, "payStartTime", "璇锋眰鎶ユ枃涓湭鍖呭惈payStartTime");
         Assert.hasKeyAndValue(reqJson, "payEndTime", "璇锋眰鎶ユ枃涓湭鍖呭惈payEndTime");
         Assert.hasKeyAndValue(reqJson, "payMonth", "璇锋眰鎶ユ枃涓湭鍖呭惈payMonth");
+        IntegralRuleFeeDto integralRuleFeeDto = new IntegralRuleFeeDto();
+        integralRuleFeeDto.setRuleId(reqJson.getString("ruleId"));
+        integralRuleFeeDto.setFeeConfigId(reqJson.getString("feeConfigId"));
+        long count = integralRuleFeeV1InnerServiceSMOImpl.queryIntegralRuleFeesCount(integralRuleFeeDto);
 
+        if(count > 0){
+            throw new CmdException("璐圭敤椤瑰凡缁忓叧鑱�");
+        }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        FeeConfigDto feeConfigDto = new FeeConfigDto();
+        feeConfigDto.setConfigId(reqJson.getString("feeConfigId"));
+        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
 
+        Assert.listOnlyOne(feeConfigDtos,"璐圭敤椤逛笉瀛樺湪");
         IntegralRuleFeePo integralRuleFeePo = BeanConvertUtil.covertBean(reqJson, IntegralRuleFeePo.class);
         integralRuleFeePo.setIrfId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        integralRuleFeePo.setFeeConfigName(feeConfigDtos.get(0).getFeeName());
         int flag = integralRuleFeeV1InnerServiceSMOImpl.saveIntegralRuleFee(integralRuleFeePo);
 
         if (flag < 1) {

--
Gitblit v1.8.0