From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java b/service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java
index 5f2390a..2e3edc4 100644
--- a/service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/property/DeletePropertyCmd.java
@@ -18,8 +18,9 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.Environment;
 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.dto.CommunityMemberDto;
 import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
@@ -49,7 +50,7 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "property.deleteProperty")
-public class DeletePropertyCmd extends AbstractServiceCmdListener {
+public class DeletePropertyCmd extends Cmd {
     private static Logger logger = LoggerFactory.getLogger(DeletePropertyCmd.class);
 
     @Autowired
@@ -63,6 +64,7 @@
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Environment.isDevEnv();
         Assert.hasKeyAndValue(reqJson, "storeId", "storeId涓嶈兘涓虹┖");
         Assert.hasKeyAndValue(reqJson, "storeTypeCd", "storeTypeCd涓嶈兘涓虹┖");
 
@@ -83,7 +85,7 @@
         communityMemberDto.setMemberId(storePo.getStoreId());
         List<CommunityMemberDto> communityMemberDtos = communityMemberV1InnerServiceSMOImpl.queryCommunityMembers(communityMemberDto);
 
-        if (communityMemberDtos == null && communityMemberDtos.size() < 1) {
+        if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
             cmdDataFlowContext.setResponseEntity(ResultVo.success());
             return;
         }
@@ -93,7 +95,7 @@
         communityMemberPo.setMemberId(storePo.getStoreId());
         flag = communityMemberV1InnerServiceSMOImpl.deleteCommunityMember(communityMemberPo);
         if (flag < 1) {
-            throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+            throw new CmdException("閲婃斁灏忓尯澶辫触");
         }
 
         //灏忓尯鏉冮檺涔熻涪鎺�
@@ -102,7 +104,7 @@
             menuGroupCommunityPo.setCommunityId(tmpCommunityMemberDto.getCommunityId());
             flag = menuGroupCommunityV1InnerServiceSMOImpl.deleteMenuGroupCommunity(menuGroupCommunityPo);
             if (flag < 1) {
-                throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
+                throw new CmdException("灏忓尯鏉冮檺韪㈡帀澶辫触");
             }
         }
 

--
Gitblit v1.8.0