From 8effc395f2953b487f452cf04616f547f41b0819 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 八月 2022 22:26:46 +0800
Subject: [PATCH] 优化代码

---
 service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
index b6307aa..5c085df 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java
@@ -4,7 +4,7 @@
 import com.java110.core.annotation.Java110Cmd;
 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.core.factory.AuthenticationFactory;
 import com.java110.core.factory.GenerateCodeFactory;
@@ -26,7 +26,7 @@
 import java.util.List;
 
 @Java110Cmd(serviceCode = "user.resetStaffPwd")
-public class ResetStaffPwdCmd extends AbstractServiceCmdListener {
+public class ResetStaffPwdCmd extends Cmd {
 
     @Autowired
     private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
@@ -45,16 +45,29 @@
 
         Environment.isDevEnv();
 
+        if(reqJson.containsKey("storeId") && StoreDto.STORE_ADMIN.equals(reqJson.getString("storeId"))){
+            return ;
+        }
+
         if (!reqJson.containsKey("staffId")) {
             reqJson.put("staffId", reqJson.getString("userId"));
         }
 
         Assert.jsonObjectHaveKey(reqJson, "staffId", "璇锋眰鍙傛暟涓湭鍖呭惈staffId 鑺傜偣锛岃纭");
 
+        StoreUserDto storeUserDt = new StoreUserDto();
+        storeUserDt.setUserId(reqJson.getString("userId"));
+        List<StoreUserDto> storeUserDts = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDt);
+        Assert.listOnlyOne(storeUserDts, "鏌ヨ鍛樺伐鍟嗘埛閿欒锛�");
+
         //棣栧厛鍒ゆ柇鏄惁涓� 杩愯惀鎴栬�呭紑鍙�
         //鏌ヨstore 淇℃伅
         StoreDto storeDto = new StoreDto();
-        storeDto.setStoreId(reqJson.getString("storeId"));
+        if (!reqJson.containsKey("storeId")) {
+            storeDto.setStoreId(storeUserDts.get(0).getStoreId());
+        } else {
+            storeDto.setStoreId(reqJson.getString("storeId"));
+        }
         List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
 
         Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
@@ -65,7 +78,7 @@
 
         //鏍¢獙 staff 鍜� store 涔嬮棿鏄惁鏈� 鍏崇郴 闃叉 鏀诲嚮
         StoreUserDto storeUserDto = new StoreUserDto();
-        storeUserDto.setUserId(reqJson.getString("staffId"));
+        storeUserDto.setUserId(reqJson.getString("userId"));
         storeUserDto.setStoreId(reqJson.getString("storeId"));
         List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);
 

--
Gitblit v1.8.0