用户微服务-增加修改用户基础信息接口

userCenter_service/src/main/java/com/bjtdba/userCenter/controller/UserController.java

@@ -6,6 +6,7 @@ import com.bjtdba.entity.userCenter.UserAddress;
 import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.entity.userCenter.UserCertification;
 import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.UpdateUserInfoRequest;
 import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.ApiResponse;
@@ -608,6 +609,12 @@ public class UserController {
         return ResponseEntity.ok(userService.getUserList(request));
     }
 
+    @PostMapping("/updateUserInfo")
+    public ApiResponse<UserDTO> updateUserInfo(@Validated @RequestBody UpdateUserInfoRequest request) {
+
+        return ApiResponse.success(userService.updateUserInfo(request));
+    }
+
     @PostMapping("/{uid}/score")
     public ApiResponse<UserScoreModifyResponse> modifyUserScore(
             @PathVariable Integer uid,

userCenter_service/src/main/java/com/bjtdba/userCenter/dao/UserDao.java

@@ -55,7 +55,7 @@ public interface UserDao {
             @Param("status") Integer status
     );
 
-    UserEntity getUserScoreByUidForUpdate(@Param("uid") Integer uid);
+    UserEntity getUserInfoByUidForUpdate(@Param("uid") Integer uid);
 
     int updateUserScore(@Param("uid") Integer uid,
                         @Param("newScore") BigDecimal newScore);

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/request/UpdateUserInfoRequest.java

@@ -0,0 +1,41 @@
+package com.bjtdba.userCenter.dto.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.*;
+
+import java.math.BigDecimal;
+
+@Data
+public class UpdateUserInfoRequest {
+    @NotEmpty(message = "用户ID不能为空")
+    private Integer uid;
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "账号格式错误")
+    private String account;
+    private String realName;
+    private String nickname;
+    private Long spreadUid;
+    private String avatar;
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式错误")
+    private String phone;
+    @Positive(message = "积分必须为正数")
+    private BigDecimal score;
+    @Positive(message = "佣金必须为正数")
+    private BigDecimal brokeragePrice;
+    @Positive(message = "复购金必须为正数")
+    private BigDecimal repurchasePrice;
+    private Integer status;
+    private Integer external;
+    private Integer externalId;
+    private Integer levelId;
+    private Integer userGroup;
+    @Positive(message = "贡献值必须为正数")
+    private BigDecimal contribute;
+    @Positive(message = "京豆必须为正数")
+    private BigDecimal jingdou;
+    @Positive(message = "VR必须为正数")
+    private BigDecimal vr;
+    @Positive(message = "PV必须为正数")
+    private BigDecimal pv;
+}
+

userCenter_service/src/main/java/com/bjtdba/userCenter/service/UserService.java

@@ -3,6 +3,7 @@ package com.bjtdba.userCenter.service;
 import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.UpdateUserInfoRequest;
 import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
@@ -44,4 +45,6 @@ public interface UserService {
     PageResult<UserDTO> getUserList(GetUserListRequest request);
 
     UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request);
+
+    UserDTO updateUserInfo(UpdateUserInfoRequest request);
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserServiceImpl.java

@@ -4,6 +4,7 @@ import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.userCenter.dao.*;
 import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.UpdateUserInfoRequest;
 import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
@@ -140,7 +141,7 @@ public class UserServiceImpl  implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request) {
         // 1. 获取用户并加锁
-        UserEntity userEntity = userDao.getUserScoreByUidForUpdate(request.getUid());
+        UserEntity userEntity = userDao.getUserInfoByUidForUpdate(request.getUid());
         if (userEntity == null) {
             throw BusinessException.userNotFound();
         }
@@ -195,4 +196,20 @@ public class UserServiceImpl  implements UserService {
                 request.getPm() == 1 ? "收入" : "支出",
                 request.getOrderId());
     }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserDTO updateUserInfo(UpdateUserInfoRequest request) {
+        // 1. 获取用户并加锁
+        UserEntity userEntity = userDao.getUserInfoByUidForUpdate(request.getUid());
+        if (userEntity == null) {
+            throw BusinessException.userNotFound();
+        }
+
+        // 2. 判断积分值是否有变动
+
+
+        return null;
+    }
 }

userCenter_service/src/main/resources/mapper/UserExternalMapper.xml

@@ -55,10 +55,10 @@
         <include refid="queryCondition"/>
     </select>
 
-    <select id="getUserScoreByUidForUpdate" resultMap="userResultMap">
-        SELECT uid, score
+    <select id="getUserInfoByUidForUpdate" resultMap="userResultMap">
+        SELECT <include refid="baseColumn"/>
         FROM rrx_user
-        WHERE uid = #{uid} FOR UPDATE
+        WHERE is_del = 0 AND uid = #{uid} FOR UPDATE
     </select>
 
     <update id="updateUserScore">