fix

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java

@@ -45,6 +45,7 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
      * 微信号码
      */
     private String weiChatCode;
+    private String weiChatAvatar;
 
     /**
      * 陪聊用户ID

play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java

@@ -9,6 +9,7 @@ import com.starry.admin.modules.system.entity.SysRoleEntity;
 import com.starry.admin.modules.system.entity.SysUserEntity;
 import com.starry.admin.modules.system.service.SysRoleService;
 import com.starry.admin.modules.system.service.SysUserService;
+import com.starry.admin.modules.system.vo.UserAddParam;
 import com.starry.admin.modules.system.vo.UserQueryVo;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.annotation.Log;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -82,16 +84,10 @@ public class SysUserController {
 
     @ApiOperation(value = "添加用户")
     @PostMapping(value = "add/v1")
-    public R addV1(@RequestBody SysUserEntity user) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserCode()))) {
-            return R.error("新增用户'" + user.getUserCode() + "'失败，登录账号已存在");
-        }
-        boolean success = userService.create(user);
-        if (success) {
+    public R addV1(@Valid @RequestBody UserAddParam param) {
+        boolean success = userService.addV1(param);
         return R.ok();
     }
-        return R.error("添加失败");
-    }
 
     @ApiOperation(value = "修改用户")
     @PostMapping(value = "/update/{id}")

play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserEntity.java

@@ -82,6 +82,8 @@ public class SysUserEntity extends BaseEntity<SysUserEntity> {
     @ApiModelProperty(value = "租户id")
     private String tenantId;
 
+    private String clerkId;
+
     /**
      * 角色对象
      */

play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.starry.admin.modules.system.entity.SysUserEntity;
 import com.starry.admin.modules.system.vo.RoleUserResultVo;
 import com.starry.admin.modules.system.vo.SysUserQueryVo;
+import com.starry.admin.modules.system.vo.UserAddParam;
 import com.starry.admin.modules.system.vo.UserQueryVo;
 
 import java.util.List;
@@ -123,4 +124,6 @@ public interface SysUserService extends IService<SysUserEntity> {
      * @return 用户信息集合信息
      */
     IPage<RoleUserResultVo> selectUnallocatedList(SysUserQueryVo user);
+
+    boolean addV1(UserAddParam param);
 }

play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java

@@ -1,13 +1,14 @@
 package com.starry.admin.modules.system.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.starry.admin.utils.SecurityUtils;
-import com.starry.common.utils.IdUtils;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.system.entity.SysRoleEntity;
 import com.starry.admin.modules.system.entity.SysUserEntity;
 import com.starry.admin.modules.system.entity.SysUserRoleEntity;
@@ -17,9 +18,12 @@ import com.starry.admin.modules.system.service.SysUserRoleService;
 import com.starry.admin.modules.system.service.SysUserService;
 import com.starry.admin.modules.system.vo.RoleUserResultVo;
 import com.starry.admin.modules.system.vo.SysUserQueryVo;
+import com.starry.admin.modules.system.vo.UserAddParam;
 import com.starry.admin.modules.system.vo.UserQueryVo;
+import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.annotation.DataScope;
 import com.starry.common.constant.UserConstants;
+import com.starry.common.utils.IdUtils;
 import com.starry.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -51,6 +55,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     private SysUserRoleService userRoleService;
     @Resource
     private SysRoleMapper sysRoleMapper;
+    @Resource
+    private IPlayClerkUserInfoService clerkUserInfoService;
 
 
     @Override
@@ -145,11 +151,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 
     @Override
     public SysUserEntity selectUserById(String userId) {
-        if(StringUtils.isEmpty(userId)){
+        if (StringUtils.isEmpty(userId)) {
             userId = SecurityUtils.getUserId();
         }
         SysUserEntity data = baseMapper.selectUserById(userId);
-        if(Objects.isNull(data)){
+        if (Objects.isNull(data)) {
             throw new RuntimeException("未查询到指定用户");
         }
         return data;
@@ -217,4 +223,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
     public IPage<RoleUserResultVo> selectUnallocatedList(SysUserQueryVo user) {
         return baseMapper.selectUnallocatedList(new Page<>(user.getPageNum(), user.getPageSize()), user);
     }
+
+    @Override
+    public boolean addV1(UserAddParam param) {
+        long count = this.count(Wrappers.lambdaQuery(SysUserEntity.class).eq(SysUserEntity::getClerkId, param.getClerkId()));
+        if (count > 0) {
+            throw new RuntimeException("该店员已经成为员工了，无法再次添加~");
+        }
+        PlayClerkUserInfoEntity clerk = clerkUserInfoService.selectById(param.getClerkId());
+        SysUserEntity user = new SysUserEntity().setClerkId(param.getClerkId()).setMobile(param.getMobile()).setPassWord(SecurityUtils.encryptPassword(param.getMobile()))
+                .setUserCode(param.getMobile()).setUserNickname(clerk.getNickname()).setRealName(clerk.getNickname());
+        user.setUserId(IdUtils.getUuid());
+        user.setSuperAdmin(false);
+        this.save(user);
+        clerkUserInfoService.update(null, Wrappers.lambdaUpdate(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getId, param.getClerkId()).set(PlayClerkUserInfoEntity::getPlayUserId, user.getUserId()));
+        return true;
+    }
 }

play-admin/src/main/java/com/starry/admin/modules/system/vo/UserAddParam.java

@@ -0,0 +1,24 @@
+package com.starry.admin.modules.system.vo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @Author: huchuansai
+ * @Date: 2024/6/14 11:27 AM
+ * @Description:
+ */
+@Data
+public class UserAddParam {
+
+    @NotEmpty(message = "请指定店员")
+    private String clerkId;
+
+    @NotEmpty(message = "请指定手机号")
+    private String mobile;
+
+    @NotEmpty(message = "请指定短信验证码")
+    private String smsCode;
+
+}

play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayWxUserInfoEntity.java

@@ -1,69 +0,0 @@
-package com.starry.admin.modules.weichat.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.starry.common.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 微信用户对象 play_wx_user_info
- *
- * @author admin
- * @since 2024-04-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("play_wx_user_info")
-public class PlayWxUserInfoEntity extends BaseEntity<PlayWxUserInfoEntity> {
-
-    /**
-     * UUID
-     */
-    private String id;
-
-    /**
-     * 租户ID
-     */
-    private String tenantId;
-
-    /**
-     * 用户的标识，对当前公众号唯一
-     */
-    private String openid;
-
-    /**
-     * 用户的标识，对当前公众号唯一
-     */
-    private String unionid;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 性别，值为1时是男性，值为2时是女性，值为0时是未知
-     */
-    private Integer sex;
-
-    /**
-     * 所在城市
-     */
-    private String city;
-
-    /**
-     * 所在国家
-     */
-    private String country;
-
-    /**
-     * 所在省份
-     */
-    private String province;
-
-    /**
-     * 所在省份
-     */
-    private String avatar;
-
-}

play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java

@@ -67,6 +67,7 @@ public class WxOauthService {
         if (item == null) {
             PlayClerkUserInfoEntity entity = ConvertUtil.entityToVo(userInfo, PlayClerkUserInfoEntity.class);
             entity.setAvatar(userInfo.getHeadImgUrl());
+            entity.setWeiChatAvatar(userInfo.getHeadImgUrl());
             entity.setId(IdUtils.getUuid());
             entity.setLevelId(playClerkLevelInfoService.getDefaultLevel().getId());
             clerkUserInfoService.create(entity);

play-admin/src/main/resources/mapper/system/SysUserMapper.xml

@@ -19,6 +19,7 @@
         <result column="super_admin" property="superAdmin"/>
         <result column="created_time" property="createdTime"/>
         <result column="created_by" property="createdBy"/>
+        <result column="clerk_id" property="clerkId"/>
         <result column="deleted" property="deleted"/>
         <result column="version" property="version"/>