From 146bd184f86648f21603d7d6698cdbe0a2df7cff Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 18 八月 2022 14:50:52 +0800
Subject: [PATCH] 优化报修，采购，缴费bug
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
index def8ed2..85524ec 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -22,7 +21,6 @@
import com.java110.po.store.StoreUserPo;
import com.java110.po.user.UserPo;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.StoreUserRelConstant;
import com.java110.utils.constant.UserLevelConstant;
@@ -59,13 +57,18 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+
+ if (!reqJson.containsKey("storeId")) {
+ String storeId = context.getReqHeaders().get("store-id");
+ reqJson.put("storeId", storeId);
+ }
//鑾峰彇鏁版嵁涓婁笅鏂囧璞�
Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "璇锋眰鍙傛暟涓湭鍖呭惈storeTypeCd 鑺傜偣锛岃纭");
//鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
UserDto userDto = new UserDto();
userDto.setTel(reqJson.getString("tel"));
userDto.setUserFlag("1");
+ userDto.setLevelCd("01"); //鍛樺伐
List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
@@ -75,18 +78,17 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String userId = "";
- String oldUserId = "";
+
String relCd = reqJson.getString("relCd");//鍛樺伐 缁勭粐 宀椾綅
- if (!reqJson.containsKey("userId") || "-1".equals(reqJson.getString("userId"))) {
- //灏唘serId 寮哄埗鍐欐垚-1
- oldUserId = "-1";
- userId = GenerateCodeFactory.getUserId();
- reqJson.put("userId", userId);
- //娣诲姞鐢ㄦ埛
- addUser(reqJson);
- }
+
+ userId = GenerateCodeFactory.getUserId();
reqJson.put("userId", userId);
- reqJson.put("relCd", "-1".equals(oldUserId) ? StoreUserRelConstant.REL_COMMON : StoreUserRelConstant.REL_ADMIN);
+ //娣诲姞鐢ㄦ埛
+ addUser(reqJson);
+ reqJson.put("userId", userId);
+ if (!reqJson.containsKey("relCd") || StringUtil.isEmpty(reqJson.getString("relCd"))) {
+ reqJson.put("relCd", StoreUserRelConstant.REL_COMMON);
+ }
addStaff(reqJson);
//閲嶅啓 鍛樺伐宀椾綅
reqJson.put("relCd", relCd);
@@ -111,7 +113,7 @@
businessUnit.put("fileSaveName", fileName);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
- if(flag <1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨鍥剧墖寮傚父");
}
}
@@ -128,10 +130,8 @@
Assert.jsonObjectHaveKey(paramObj, "name", "璇锋眰鍙傛暟涓湭鍖呭惈name 鑺傜偣锛岃纭");
//Assert.jsonObjectHaveKey(paramObj,"email","璇锋眰鍙傛暟涓湭鍖呭惈email 鑺傜偣锛岃纭");
Assert.jsonObjectHaveKey(paramObj, "tel", "璇锋眰鍙傛暟涓湭鍖呭惈tel 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramObj, "orgId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閮ㄩ棬淇℃伅");
Assert.jsonObjectHaveKey(paramObj, "address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
Assert.jsonObjectHaveKey(paramObj, "sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
- Assert.jsonObjectHaveKey(paramObj, "relCd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍛樺伐瑙掕壊");
if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
@@ -188,8 +188,12 @@
public void addStaffOrg(JSONObject paramInJson) {
+ if (!paramInJson.containsKey("orgId") || StringUtil.isEmpty(paramInJson.getString("orgId"))) {
+ return;
+ }
+
JSONObject businessOrgStaffRel = new JSONObject();
- businessOrgStaffRel.put("relId", "-1");
+ businessOrgStaffRel.put("relId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
businessOrgStaffRel.put("storeId", paramInJson.getString("storeId"));
businessOrgStaffRel.put("staffId", paramInJson.getString("userId"));
businessOrgStaffRel.put("orgId", paramInJson.getString("orgId"));
--
Gitblit v1.8.0