用户新增编号

ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java

@@ -1,10 +1,14 @@
 package com.ruoyi.web.controller.user;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
+import com.ruoyi.system.enums.SequencePrefixEnum;
+import com.ruoyi.system.service.ISysSequenceService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
@@ -43,6 +47,7 @@ import io.swagger.annotations.ApiOperation;
 public class UserController extends BaseController {
 
     private final IUserService iUserService;
+    private final ISysSequenceService sysSequenceService;
 
     /**
      * 查询小程序用户管理列表
@@ -88,6 +93,7 @@ public class UserController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserBo bo) {
+        bo.setBusinessId(sysSequenceService.generateSequence(SequencePrefixEnum.PRE_USER, DateUtil.format(new Date(), "yyMMdd"), 6));
         return toAjax(iUserService.insertByBo(bo) ? 1 : 0);
     }
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserLoginController.java

@@ -1,12 +1,15 @@
 package com.ruoyi.api.controller.user;
 
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.RegGroup;
 import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.framework.web.service.ApiTokenService;
+import com.ruoyi.system.enums.SequencePrefixEnum;
+import com.ruoyi.system.service.ISysSequenceService;
 import com.ruoyi.user.domain.User;
 import com.ruoyi.user.enums.UserThirdType;
 import com.ruoyi.user.service.IUserService;
@@ -22,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -45,6 +49,8 @@ public class ApiUserLoginController extends AbstractApiController {
 
     private final WxUserService wxUserService;
 
+    private final ISysSequenceService sysSequenceService;
+
     /**
      * 获取小程序openId
      */
@@ -90,6 +96,7 @@ public class ApiUserLoginController extends AbstractApiController {
     @ApiOperation("注册用户，小程序授权且获取了手机号")
     @PostMapping("/user/authorization/register")
     public R<Map<String, Object>> registerAuthorization(@RequestBody @Validated(RegGroup.class) WxUserDto wxUserDto) {
+        wxUserDto.setBusinessId(sysSequenceService.generateSequence(SequencePrefixEnum.PRE_USER, DateUtil.format(new Date(), "yyMMdd"), 6));
         User user = userService.authorization(wxUserDto);
         String token = apiTokenService.generateToken(user);
         HashMap<String, Object> result = new HashMap<>();

ruoyi-system/src/main/java/com/ruoyi/system/enums/SequencePrefixEnum.java

@@ -10,6 +10,7 @@ import java.util.Objects;
 public enum SequencePrefixEnum implements IIntegerEnum<String> {
 
     PRE_ORDER("P", "订单号"),
+    PRE_USER("U", "用户编号"),
     ;
 
     private String code;

ruoyi-user/src/main/java/com/ruoyi/user/domain/User.java

@@ -33,6 +33,10 @@ public class User  {
      */
     @TableId(value = "id")
     private Long id;
+    /**
+     * 业务id
+     */
+    private String businessId;
     /**
      * 手机号
      */

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserBo.java

@@ -33,6 +33,11 @@ public class UserBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 业务id
+     */
+    private String businessId;
+
     /**
      * 手机号
      */

ruoyi-user/src/main/java/com/ruoyi/user/domain/vo/UserVo.java

@@ -36,6 +36,13 @@ public class UserVo {
     @ApiModelProperty("id")
     private Long id;
 
+    /**
+     * 业务id
+     */
+    @ExcelProperty(value = "业务id")
+    @ApiModelProperty("业务id")
+    private String businessId;
+
     /**
      * 手机号
      */

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -101,6 +101,7 @@ public class UserServiceImpl implements IUserService {
         lqw.like(StrUtil.isNotBlank(bo.getMobile()), User::getMobile, bo.getMobile());
         lqw.like(StrUtil.isNotBlank(bo.getNickname()), User::getNickname, bo.getNickname());
         lqw.like(StrUtil.isNotBlank(bo.getRealName()), User::getRealName, bo.getRealName());
+        lqw.like(StrUtil.isNotBlank(bo.getBusinessId()), User::getBusinessId, bo.getBusinessId());
         lqw.eq(StrUtil.isNotBlank(bo.getHeadPhoto()), User::getHeadPhoto, bo.getHeadPhoto());
         lqw.eq(ObjectUtil.isNotNull(bo.getAge()), User::getAge, bo.getAge());
         lqw.eq(ObjectUtil.isNotNull(bo.getGender()), User::getGender, bo.getGender());
@@ -223,6 +224,7 @@ public class UserServiceImpl implements IUserService {
 
         //创建用户
         user = new User();
+        user.setBusinessId(wxUserDto.getBusinessId());
         user.setNickname(wxUserDto.getNickname());
         user.setHeadPhoto(wxUserDto.getHeadPhoto());
         user.setAge(wxUserDto.getAge());

ruoyi-user/src/main/resources/mapper/user/UserMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.user.domain.User" id="UserResult">
         <result property="id" column="id"/>
+        <result property="businessId" column="business_id"/>
         <result property="mobile" column="mobile"/>
         <result property="nickname" column="nickname"/>
         <result property="headPhoto" column="head_photo"/>

ruoyi-weixin/ruoyi-weixin-miniapp/src/main/java/com/ruoyi/weixin/domain/WxUserDto.java

@@ -67,5 +67,9 @@ public class WxUserDto implements Serializable {
      */
     private String birthday;
 
+    /**
+     * 业务id
+     */
+    private String businessId;
 
 }