折扣已完成现有需求2025/08/09

cgf

2025-08-23 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569

 service-user/src/main/java/com/java110/user/cmd/user/UserStaffModifyCmd.java

@@ -3,6 +3,7 @@
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;
@@ -105,6 +106,27 @@
        //校验json 格式中是否包含 name,email,levelCd,tel
        Assert.jsonObjectHaveKey(reqJson, "name", "请求参数中未包含name 节点，请确认");
        Assert.jsonObjectHaveKey(reqJson, "tel", "请求参数中未包含tel 节点，请确认");
        StoreUserDto storeUserDto = new StoreUserDto();
        storeUserDto.setUserId(reqJson.getString("staffId"));
        storeUserDto.setStoreId(CmdContextUtils.getStoreId(context));
        List<StoreUserDto> storeUserDtos = storeUserV1InnerServiceSMOImpl.queryStoreUsers(storeUserDto);

        if (ListUtil.isNull(storeUserDtos)) {
            throw new CmdException("修改员工不是贵公司员工");
        }

        UserDto userDto = new UserDto();
        userDto.setTel(reqJson.getString("tel"));
        userDto.setUserFlag("1");
        userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); //员工
        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
        if (!ListUtil.isNull(users)) {
            for (UserDto user : users) {
                if (!user.getUserId().equals(reqJson.getString("staffId"))) {
                    throw new IllegalArgumentException("员工手机号不能重复，请重新输入");
                }
            }
        }
    }

    @Override
@@ -128,7 +150,7 @@
            fileRelDto.setRelTypeCd("12000");
            fileRelDto.setObjId(reqJson.getString("userId"));
            List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
            if (fileRelDtos == null || fileRelDtos.size() == 0) {
            if (ListUtil.isNull(fileRelDtos)) {
                JSONObject businessUnit = new JSONObject();
                businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
                businessUnit.put("relTypeCd", "12000");
@@ -159,19 +181,9 @@

    private void modifyStaff(JSONObject paramObj) {
        UserPo userPo = BeanConvertUtil.covertBean(paramObj, UserPo.class);
        userPo.setUserId(paramObj.getString("staffId"));
        //根据手机号查询用户
        UserDto userDto = new UserDto();
        userDto.setTel(userPo.getTel());
        userDto.setUserFlag("1");
        userDto.setLevelCd(UserDto.LEVEL_CD_STAFF); //员工
        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
        if (!ListUtil.isNull(users)) {
            for (UserDto user : users) {
                if (!user.getUserId().equals(userPo.getUserId())) {
                    throw new IllegalArgumentException("员工手机号不能重复，请重新输入");
                }
            }
        }

        if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
            Assert.isEmail(paramObj, "email", "不是有效的邮箱格式");
        }
@@ -180,9 +192,11 @@
        if (flag < 1) {
            throw new CmdException("保存用户异常");
        }

        UserDto userDto = new UserDto();
        userDto.setUserId(userPo.getUserId());
        List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
        //todo 修改身份证
        updateStaffIdCard(users.get(0),paramObj);
        updateStaffIdCard(users.get(0), paramObj);

        StoreUserDto storeUserDto = new StoreUserDto();
        storeUserDto.setUserId(userPo.getUserId());
@@ -225,6 +239,7 @@

    /**
     * 修改员工身份证号
     *
     * @param userDto
     * @param paramObj
     */
@@ -239,7 +254,7 @@
        userAttrDto.setSpecCd(UserAttrDto.SPEC_ID_CARD);
        List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);

        if(!ListUtil.isNull(userAttrDtos)){
        if (!ListUtil.isNull(userAttrDtos)) {
            UserAttrPo userAttrPo = new UserAttrPo();
            userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId());
            userAttrV1InnerServiceSMOImpl.deleteUserAttr(userAttrPo);