From e52ddfe8caf7d0027950033a5aff2a1fd3482e9d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 01 六月 2022 17:50:25 +0800
Subject: [PATCH] 优化装修 跟踪记录 回显
---
service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 7ad67ef..0c69ef6 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
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.CmdEvent;
@@ -42,16 +43,31 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+ 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, "鍟嗘埛涓嶅瓨鍦�");
@@ -62,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);
@@ -74,6 +90,8 @@
modifyStaff(reqJson, cmdDataFlowContext);
JSONObject paramOut = new JSONObject();
paramOut.put("pwd", reqJson.getString("pwd"));
+ paramOut.put("code",0);
+ paramOut.put("msg","鎴愬姛");
ResponseEntity<String> responseEntity = new ResponseEntity<>(paramOut.toJSONString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
@@ -93,7 +111,7 @@
JSONObject userInfo = JSONObject.parseObject(JSONObject.toJSONString(userDtos.get(0)));
String pwd = GenerateCodeFactory.getRandomCode(6);
- userInfo.putAll(paramObj);
+ //userInfo.putAll(paramObj);
userInfo.put("password", AuthenticationFactory.passwdMd5(pwd));
paramObj.put("pwd", pwd);
--
Gitblit v1.8.0