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/feeComboMember/SaveFeeComboMemberCmd.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 a99c273..1380fa7 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
@@ -19,11 +19,12 @@
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.dto.fee.FeeComboMemberDto;
import com.java110.intf.fee.IFeeComboMemberV1InnerServiceSMO;
-import com.java110.po.feeComboMember.FeeComboMemberPo;
+import com.java110.po.fee.FeeComboMemberPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +32,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -43,7 +46,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "feeComboMember.saveFeeComboMember")
-public class SaveFeeComboMemberCmd extends AbstractServiceCmdListener {
+public class SaveFeeComboMemberCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveFeeComboMemberCmd.class);
@@ -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