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/feeCombo/SaveFeeComboCmd.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/feeCombo/SaveFeeComboCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/feeCombo/SaveFeeComboCmd.java
index 162e278..875b44a 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/feeCombo/SaveFeeComboCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/feeCombo/SaveFeeComboCmd.java
@@ -15,15 +15,18 @@
  */
 package com.java110.fee.cmd.feeCombo;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.fee.IFeeComboMemberV1InnerServiceSMO;
 import com.java110.intf.fee.IFeeComboV1InnerServiceSMO;
-import com.java110.po.feeCombo.FeeComboPo;
+import com.java110.po.fee.FeeComboPo;
+import com.java110.po.fee.FeeComboMemberPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -43,7 +46,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "feeCombo.saveFeeCombo")
-public class SaveFeeComboCmd extends AbstractServiceCmdListener {
+public class SaveFeeComboCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(SaveFeeComboCmd.class);
 
@@ -51,11 +54,13 @@
 
     @Autowired
     private IFeeComboV1InnerServiceSMO feeComboV1InnerServiceSMOImpl;
+    @Autowired
+    private IFeeComboMemberV1InnerServiceSMO feeComboMemberV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "comboName", "璇锋眰鎶ユ枃涓湭鍖呭惈comboName");
-Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
 
     }
 
@@ -63,14 +68,34 @@
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       FeeComboPo feeComboPo = BeanConvertUtil.covertBean(reqJson, FeeComboPo.class);
+        FeeComboPo feeComboPo = BeanConvertUtil.covertBean(reqJson, FeeComboPo.class);
         feeComboPo.setComboId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = feeComboV1InnerServiceSMOImpl.saveFeeCombo(feeComboPo);
 
         if (flag < 1) {
             throw new CmdException("淇濆瓨鏁版嵁澶辫触");
         }
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+        if(!reqJson.containsKey("configIds")){
+            return ;
+        }
+
+        JSONArray configIds = reqJson.getJSONArray("configIds");
+        FeeComboMemberPo feeComboMemberPo = null;
+        for(int configIndex = 0; configIndex < configIds.size() ; configIndex ++){
+            feeComboMemberPo = new FeeComboMemberPo();
+            feeComboMemberPo.setComboId(feeComboPo.getComboId());
+            feeComboMemberPo.setCommunityId(reqJson.getString("communityId"));
+            feeComboMemberPo.setConfigId(configIds.getString(configIndex));
+            feeComboMemberPo.setMemberId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+
+            flag = feeComboMemberV1InnerServiceSMOImpl.saveFeeComboMember(feeComboMemberPo);
+            if (flag < 1) {
+                throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+            }
+        }
+
+
     }
 }

--
Gitblit v1.8.0