From c3e3d235a54619bb2a5bd5daba0b6062c8b7f780 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 18 四月 2022 17:47:51 +0800
Subject: [PATCH] 优化房屋
---
service-user/src/main/java/com/java110/user/cmd/user/ResetStaffPwdCmd.java | 20 +++++++++++++++++---
1 files changed, 17 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 8be83ad..4c71c73 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,27 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+ Environment.isDevEnv();
+
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, "鍟嗘埛涓嶅瓨鍦�");
@@ -74,6 +86,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);
@@ -86,14 +100,14 @@
UserDto userDto = new UserDto();
userDto.setStatusCd("0");
- userDto.setUserId(paramObj.getString("userId"));
+ userDto.setUserId(paramObj.getString("staffId"));
List<UserDto> userDtos = userInnerServiceSMOImpl.getUserHasPwd(userDto);
Assert.listOnlyOne(userDtos, "鏁版嵁閿欒鏌ヨ鍒板鏉＄敤鎴蜂俊鎭垨鍗曟潯");
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