From bde271fdbab51e654a293dba02a31eab8ff3ea8b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期四, 21 八月 2025 20:20:23 +0800
Subject: [PATCH] 白单流水报表与费用初始化（差创建折扣使用记录）0821
---
service-user/src/main/java/com/java110/user/cmd/user/UserStaffAddCmd.java | 129 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 37 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..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,26 +3,27 @@
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.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.dto.file.FileDto;
+import com.java110.doc.annotation.*;
+import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
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.BusinessTypeConstant;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.StoreUserRelConstant;
import com.java110.utils.constant.UserLevelConstant;
@@ -35,21 +36,54 @@
import java.util.List;
+
+@Java110CmdDoc(title = "娣诲姞鍛樺伐",
+ description = "澶栭儴绯荤粺閫氳繃娣诲姞鍛樺伐鎺ュ彛 娣诲姞鍛樺伐锛屾敞鎰忛渶瑕佺墿涓氱鐞嗗憳璐﹀彿鐧诲綍锛屽洜涓轰笉闇�瑕佷紶storeId 鏄牴鎹鐞嗗憳鐧诲綍淇℃伅鑾峰彇鐨�",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/user.staff.add",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "user.staff.add",
+ seq = 3
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "orgId", length = 30, remark = "缁勭粐ID"),
+ @Java110ParamDoc(name = "orgName", length = 64, remark = "缁勭粐鍚嶇О"),
+ @Java110ParamDoc(name = "name", length = 64, remark = "鍚嶇О"),
+ @Java110ParamDoc(name = "sex", length = 64, remark = "鎬у埆 0濂� 1鐢�"),
+ @Java110ParamDoc(name = "email", length = 64, remark = "閭"),
+ @Java110ParamDoc(name = "tel", length = 11, remark = "鎵嬫満鍙�"),
+ @Java110ParamDoc(name = "address", length = 64, remark = "鍦板潃"),
+ @Java110ParamDoc(name = "relCd", length = 64, remark = "宀椾綅,鏅�氬憳宸� 1000 閮ㄩ棬缁忕悊 2000 閮ㄩ棬鍓粡鐞� 3000 閮ㄩ棬缁勯暱 4000 鍒嗗叕鍙告�荤粡鐞� 5000 鍒嗗叕鍙稿壇鎬荤粡鐞� 6000 鎬荤粡鐞嗗姪鐞� 7000 鎬诲叕鍙告�荤粡鐞� 8000 鎬诲叕鍙稿壇鎬荤粡鐞� 9000"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@Java110ExampleDoc(
+ 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")
public class UserStaffAddCmd extends Cmd {
-
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Autowired
private IStoreUserV1InnerServiceSMO storeUserV1InnerServiceSMOImpl;
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
@@ -59,59 +93,51 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+ String storeId = CmdContextUtils.getStoreId(context);
+ Assert.hasLength(storeId, "鐢ㄦ埛鏈櫥褰�");
+
//鑾峰彇鏁版嵁涓婁笅鏂囧璞�
- Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鍙傛暟涓湭鍖呭惈storeId 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(reqJson, "storeTypeCd", "璇锋眰鍙傛暟涓湭鍖呭惈storeTypeCd 鑺傜偣锛岃纭");
//鍒ゆ柇鍛樺伐鎵嬫満鍙锋槸鍚﹂噸澶�(鍛樺伐鍙牴鎹墜鏈哄彿鐧诲綍骞冲彴)
UserDto userDto = new UserDto();
userDto.setTel(reqJson.getString("tel"));
userDto.setUserFlag("1");
- List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ userDto.setLevelCd("01"); //鍛樺伐
+ userDto.setStoreId(storeId);
+ List<UserDto> users = userInnerServiceSMOImpl.getStaffs(userDto);
Assert.listIsNull(users, "鍛樺伐鎵嬫満鍙蜂笉鑳介噸澶嶏紝璇烽噸鏂拌緭鍏�");
-
}
@Override
@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);
addStaffOrg(reqJson);
int flag = 0;
if (reqJson.containsKey("photo") && !StringUtils.isEmpty(reqJson.getString("photo"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("photo"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("photoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
JSONObject businessUnit = new JSONObject();
businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "12000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", userId);
- businessUnit.put("fileRealName", fileDto.getFileId());
- businessUnit.put("fileSaveName", fileName);
+ businessUnit.put("fileRealName", reqJson.getString("photo"));
+ businessUnit.put("fileSaveName", reqJson.getString("photo"));
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
- if(flag <1){
+ if (flag < 1) {
throw new CmdException("淇濆瓨鍥剧墖寮傚父");
}
}
@@ -128,10 +154,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"))) {
@@ -145,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);
}
/**
@@ -188,8 +239,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