From 5700f42a37a2f9ecc27161e2b0559a820d320f6b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 17 三月 2025 15:11:40 +0800
Subject: [PATCH] 开发完成同一个手机号登录不同物业公司的支持
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 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 084e231..df53624 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,21 +3,25 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
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;
import com.java110.doc.annotation.*;
+import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.store.IStoreUserV1InnerServiceSMO;
+import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.file.FileRelPo;
import com.java110.po.org.OrgStaffRelPo;
import com.java110.po.store.StoreUserPo;
+import com.java110.po.user.UserAttrPo;
import com.java110.po.user.UserPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
@@ -34,12 +38,13 @@
@Java110CmdDoc(title = "娣诲姞鍛樺伐",
- description = "澶栭儴绯荤粺閫氳繃娣诲姞鍛樺伐鎺ュ彛 娣诲姞鍛樺伐",
+ description = "澶栭儴绯荤粺閫氳繃娣诲姞鍛樺伐鎺ュ彛 娣诲姞鍛樺伐锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
httpMethod = "post",
url = "http://{ip}:{port}/app/user.staff.add",
resource = "userDoc",
author = "鍚村鏂�",
- serviceCode = "user.staff.add"
+ serviceCode = "user.staff.add",
+ seq = 3
)
@Java110ParamsDoc(params = {
@@ -50,7 +55,7 @@
@Java110ParamDoc(name = "email", length = 64, remark = "閭"),
@Java110ParamDoc(name = "tel", length = 11, remark = "鎵嬫満鍙�"),
@Java110ParamDoc(name = "address", length = 64, remark = "鍦板潃"),
- @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,{\"description\":\"鏅�氬憳宸",\"id\":0,\"name\":\"鏅�氬憳宸",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"1000\",\"total\":0},{\"description\":\"閮ㄩ棬缁忕悊\",\"id\":0,\"name\":\"閮ㄩ棬缁忕悊\",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"2000\",\"total\":0},{\"description\":\"閮ㄩ棬鍓粡鐞哱",\"id\":0,\"name\":\"閮ㄩ棬鍓粡鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"3000\",\"total\":0},{\"description\":\"閮ㄩ棬缁勯暱\",\"id\":0,\"name\":\"閮ㄩ棬缁勯暱\",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"4000\",\"total\":0},{\"description\":\"鍒嗗叕鍙告�荤粡鐞哱",\"id\":0,\"name\":\"鍒嗗叕鍙告�荤粡鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"5000\",\"total\":0},{\"description\":\"鍒嗗叕鍙稿壇鎬荤粡鐞哱",\"id\":0,\"name\":\"鍒嗗叕鍙稿壇鎬荤粡鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"6000\",\"total\":0},{\"description\":\"鎬荤粡鐞嗗姪鐞哱",\"id\":0,\"name\":\"鎬荤粡鐞嗗姪鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"7000\",\"total\":0},{\"description\":\"鎬诲叕鍙告�荤粡鐞哱",\"id\":0,\"name\":\"鎬诲叕鍙告�荤粡鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"8000\",\"total\":0},{\"description\":\"鎬诲叕鍙稿壇鎬荤粡鐞哱",\"id\":0,\"name\":\"鎬诲叕鍙稿壇鎬荤粡鐞哱",\"page\":-1,\"records\":0,\"row\":0,\"statusCd\":\"9000\",\"total\":0}"),
+ @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,鏅�氬憳宸� 1000 閮ㄩ棬缁忕悊 2000 閮ㄩ棬鍓粡鐞� 3000 閮ㄩ棬缁勯暱 4000 鍒嗗叕鍙告�荤粡鐞� 5000 鍒嗗叕鍙稿壇鎬荤粡鐞� 6000 鎬荤粡鐞嗗姪鐞� 7000 鎬诲叕鍙告�荤粡鐞� 8000 鎬诲叕鍙稿壇鎬荤粡鐞� 9000"),
})
@Java110ResponseDoc(
@@ -61,8 +66,8 @@
)
@Java110ExampleDoc(
- reqBody="{\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
- resBody="{'code':0,'msg':'鎴愬姛'"
+ reqBody = "{\"orgId\":\"102022091988250052\",\"orgName\":\"婕旂ず鐗╀笟 / 浠堕儴\",\"username\":\"寮犱笁\",\"sex\":\"0\",\"email\":\"231@qq.com\",\"tel\":\"123\",\"address\":\"123\",\"relCd\":\"1000\",\"photo\":\"\",\"name\":\"寮犱笁\"}",
+ resBody = "{'code':0,'msg':'鎴愬姛'}"
)
@Java110Cmd(serviceCode = "user.staff.add")
@@ -70,6 +75,9 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@@ -85,18 +93,17 @@
@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);
- }
+ String storeId = CmdContextUtils.getStoreId(context);
+ Assert.hasLength(storeId, "鐢ㄦ埛鏈櫥褰�");
+
//鑾峰彇鏁版嵁涓婁笅鏂囧璞�
- Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
//鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
UserDto userDto = new UserDto();
userDto.setTel(reqJson.getString("tel"));
userDto.setUserFlag("1");
userDto.setLevelCd("01"); //鍛樺伐
- List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ userDto.setStoreId(storeId);
+ List<UserDto> users = userInnerServiceSMOImpl.getStaffs(userDto);
Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
}
@@ -162,6 +169,33 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鐢ㄦ埛寮傚父");
}
+ //todo 淇濆瓨鐢ㄦ埛韬唤璇佸彿
+ saveUserIdCard(userPo, paramObj);
+ }
+
+ /**
+ * 淇濆瓨鐢ㄦ埛韬唤璇佸彿
+ *
+ * @param userPo
+ * @param paramObj
+ */
+ private void saveUserIdCard(UserPo userPo, JSONObject paramObj) {
+ if (!paramObj.containsKey("idCard")) {
+ return;
+ }
+
+ String idCard = paramObj.getString("idCard");
+ if (StringUtil.isEmpty(idCard)) {
+ return;
+ }
+
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_ID_CARD);
+ userAttrPo.setUserId(userPo.getUserId());
+ userAttrPo.setValue(idCard);
+
+ userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
}
/**
--
Gitblit v1.8.0