加入小区优化

service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralConfigCmd.java

@@ -22,6 +22,8 @@ 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.couponRuleCpps.CouponRuleCppsDto;
+import com.java110.dto.integralRuleConfig.IntegralRuleConfigDto;
 import com.java110.intf.acct.IIntegralConfigV1InnerServiceSMO;
 import com.java110.po.integralConfig.IntegralConfigPo;
 import com.java110.utils.exception.CmdException;

service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleConfigCmd.java

@@ -22,6 +22,7 @@ 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.integralRuleConfig.IntegralRuleConfigDto;
 import com.java110.intf.acct.IIntegralRuleConfigV1InnerServiceSMO;
 import com.java110.po.integralRuleConfig.IntegralRuleConfigPo;
 import com.java110.utils.exception.CmdException;
@@ -57,7 +58,16 @@ public class SaveIntegralRuleConfigCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "ruleId", "请求报文中未包含ruleId");
         Assert.hasKeyAndValue(reqJson, "configId", "请求报文中未包含configId");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+//查询 规则是否已经关联过 优惠券
 
+        IntegralRuleConfigDto integralRuleConfigDto = new IntegralRuleConfigDto();
+        integralRuleConfigDto.setRuleId(reqJson.getString("ruleId"));
+        integralRuleConfigDto.setConfigId(reqJson.getString("configId"));
+        int count = integralRuleConfigV1InnerServiceSMOImpl.queryIntegralRuleConfigsCount(integralRuleConfigDto);
+
+        if(count > 0){
+            throw new CmdException("该积分标准已经关联过");
+        }
     }
 
     @Override

service-acct/src/main/java/com/java110/acct/cmd/integral/SaveIntegralRuleFeeCmd.java

@@ -22,7 +22,11 @@ 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.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;
@@ -32,6 +36,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 /**
  * 类表述：保存
  * 服务编码：integralRuleFee.saveIntegralRuleFee
@@ -52,24 +58,38 @@ public class SaveIntegralRuleFeeCmd extends Cmd {
     @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) {

service-acct/src/main/java/com/java110/acct/cmd/integral/UpdateIntegralRuleFeeCmd.java

@@ -21,7 +21,9 @@ import com.java110.core.annotation.Java110Transactional;
 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.FeeConfigDto;
 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 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -45,24 +49,33 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "integral.updateIntegralRuleFee")
 public class UpdateIntegralRuleFeeCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateIntegralRuleFeeCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateIntegralRuleFeeCmd.class);
 
 
     @Autowired
     private IIntegralRuleFeeV1InnerServiceSMO integralRuleFeeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "ircId", "ircId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
 
     @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);
 
-       IntegralRuleFeePo integralRuleFeePo = BeanConvertUtil.covertBean(reqJson, IntegralRuleFeePo.class);
+        Assert.listOnlyOne(feeConfigDtos,"费用项不存在");
+        IntegralRuleFeePo integralRuleFeePo = BeanConvertUtil.covertBean(reqJson, IntegralRuleFeePo.class);
+        integralRuleFeePo.setFeeConfigName(feeConfigDtos.get(0).getFeeName());
         int flag = integralRuleFeeV1InnerServiceSMOImpl.updateIntegralRuleFee(integralRuleFeePo);
 
         if (flag < 1) {