From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/SaveFeeComboMemberCmd.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/SaveFeeComboMemberCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/SaveFeeComboMemberCmd.java
index ecea84f..98350a6 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/SaveFeeComboMemberCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/feeComboMember/SaveFeeComboMemberCmd.java
@@ -22,6 +22,7 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.feeComboMember.FeeComboMemberDto;
 import com.java110.intf.fee.IFeeComboMemberV1InnerServiceSMO;
 import com.java110.po.feeComboMember.FeeComboMemberPo;
 import com.java110.utils.exception.CmdException;
@@ -31,6 +32,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 /**
  * 绫昏〃杩帮細淇濆瓨
@@ -55,16 +58,22 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "comboId", "璇锋眰鎶ユ枃涓湭鍖呭惈comboId");
-Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰鎶ユ枃涓湭鍖呭惈configId");
-Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
+        Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰鎶ユ枃涓湭鍖呭惈configId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       FeeComboMemberPo feeComboMemberPo = BeanConvertUtil.covertBean(reqJson, FeeComboMemberPo.class);
+        FeeComboMemberDto feeComboMemberDto = new FeeComboMemberDto();
+        feeComboMemberDto.setConfigId(reqJson.getString("configId"));
+        feeComboMemberDto.setComboId(reqJson.getString("comboId"));
+        feeComboMemberDto.setCommunityId(reqJson.getString("communityId"));
+        List<FeeComboMemberDto> feeComboMemberDtos = feeComboMemberV1InnerServiceSMOImpl.queryFeeComboMembers(feeComboMemberDto);
+        if (feeComboMemberDtos != null && feeComboMemberDtos.size() > 0) {
+            throw new IllegalArgumentException("璇ヨ垂鐢ㄥ椁愪笅宸叉坊鍔犺繃璇ヨ垂鐢ㄩ」锛�");
+        }
+        FeeComboMemberPo feeComboMemberPo = BeanConvertUtil.covertBean(reqJson, FeeComboMemberPo.class);
         feeComboMemberPo.setMemberId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = feeComboMemberV1InnerServiceSMOImpl.saveFeeComboMember(feeComboMemberPo);
 

--
Gitblit v1.8.0