用户服务-完善第三方对接接口（获取用户列表、添加用户、更新用户、更新用户积分、更新用户贡献值）

gateWay_server/src/main/java/com/bjtdba/gateWay/filter/ApiAuthFilter.java

@@ -40,16 +40,16 @@ public class ApiAuthFilter extends AbstractGatewayFilterFactory<ApiAuthFilter.Co
             }
 
             // 3. 验证时间戳有效性
-            try {
-                long requestTime = Long.parseLong(timestamp);
-                long currentTime = System.currentTimeMillis();
-
-                if (Math.abs(currentTime - requestTime) > TIMESTAMP_THRESHOLD) {
-                    return unauthorized(exchange, "Timestamp expired");
-                }
-            } catch (NumberFormatException e) {
-                return unauthorized(exchange, "Invalid timestamp format");
-            }
+//            try {
+//                long requestTime = Long.parseLong(timestamp);
+//                long currentTime = System.currentTimeMillis();
+//
+//                if (Math.abs(currentTime - requestTime) > TIMESTAMP_THRESHOLD) {
+//                    return unauthorized(exchange, "Timestamp expired");
+//                }
+//            } catch (NumberFormatException e) {
+//                return unauthorized(exchange, "Invalid timestamp format");
+//            }
 
             // 4. 生成并验证签名
 //            String expectedSignature = generateSignature(apiKey, timestamp);

userCenter_service/pom.xml

@@ -102,6 +102,11 @@
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.7.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

userCenter_service/src/main/java/com/bjtdba/userCenter/advice/GlobalExceptionHandler.java

@@ -5,6 +5,7 @@ import com.bjtdba.userCenter.dto.response.common.ApiResponse;
 import com.bjtdba.userCenter.exception.BusinessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -41,6 +42,18 @@ public class GlobalExceptionHandler {
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     public ApiResponse<Void> handleException(Exception e) {
         // 生产环境应记录日志而不是返回详细错误信息
+        e.printStackTrace();
         return ApiResponse.error(500, "系统繁忙，请稍后再试");
     }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiResponse<Void> handleMethodArgumentNotValid(MethodArgumentNotValidException ex) {
+        String errorMsg = ex.getBindingResult().getFieldErrors().stream()
+                .map(fieldError -> fieldError.getField() + ": " + fieldError.getDefaultMessage())
+                .findFirst()
+                .orElse("参数验证失败");
+
+        return ApiResponse.error(400, errorMsg);
+    }
 }

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

@@ -5,9 +5,8 @@ import com.bjtdba.entity.order.User;
 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.request.*;
+import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.ApiResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
@@ -609,17 +608,23 @@ public class UserController {
         return ResponseEntity.ok(userService.getUserList(request));
     }
 
+    @PostMapping("/createUserInfo")
+    public ApiResponse<UserDTO> createUserInfo(@Validated @RequestBody CreateUserInfoRequest request) {
+        return ApiResponse.success(userService.createUserInfo(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,
-            @Validated @RequestBody UserScoreModifyRequest request) {
-        request.setUid(uid); // 确保路径参数和body一致
+    @PostMapping("/modifyUserScore")
+    public ApiResponse<UserScoreModifyResponse> modifyUserScore(@Validated @RequestBody UserScoreModifyRequest request) {
         return ApiResponse.success(userService.modifyUserScore(request));
     }
+
+    @PostMapping("/modifyUserContribute")
+    public ApiResponse<UserContributeModifyResponse> modifyUserContribute(@Validated @RequestBody UserContributeModifyRequest request) {
+        return ApiResponse.success(userService.modifyUserContribute(request));
+    }
 }

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

@@ -55,8 +55,17 @@ public interface UserDao {
             @Param("status") Integer status
     );
 
+    UserEntity getUserInfoByAccount(@Param("account") String account);
+
     UserEntity getUserInfoByUidForUpdate(@Param("uid") Integer uid);
 
     int updateUserScore(@Param("uid") Integer uid,
                         @Param("newScore") BigDecimal newScore);
+
+    int updateUserContribute(@Param("uid") Integer uid,
+                        @Param("newContribute") BigDecimal newContribute);
+
+    int updateUserByUid(UserEntity userEntity);
+
+    int insertUserByUserEntity(@Param("userEntity") UserEntity userEntity);
 }

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

@@ -0,0 +1,14 @@
+package com.bjtdba.userCenter.dao;
+
+import com.bjtdba.userCenter.entity.UserSignGongxianEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface UserSignGongxianDao {
+
+    int insertByEntity(@Param("userSignGongxianEntity") UserSignGongxianEntity userSignGongxianEntity);
+
+}

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

@@ -0,0 +1,32 @@
+package com.bjtdba.userCenter.dto.request;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+@Data
+public class CreateUserInfoRequest {
+    @Valid
+    @NotNull(message = "账号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "账号格式错误")
+    private String account;
+    private String realName;
+    private String nickname;
+    private Integer sex;
+    private Long spreadUid;
+    private String avatar;
+    @Valid
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式错误")
+    private String phone;
+    private Integer status;
+    private Integer external;
+    private Integer externalId;
+    private Integer levelId;
+    @Valid
+    @NotNull(message = "登录IP地址不能为空")
+    private String lastIp;
+    private String userType;
+}
+

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

@@ -3,26 +3,32 @@ package com.bjtdba.userCenter.dto.request;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.Valid;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Positive;
 
 @Getter
 @Setter
 public class GetUserListRequest {
+    @Valid
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "账号格式错误")
     private String account;
 
     private String nickname;
 
+    @Valid
     @Positive(message = "用户ID必须为正数")
     private Long uid;
 
+    @Valid
     @Positive(message = "状态值必须为正数")
     private Integer status;
 
+    @Valid
     @Positive(message = "页码必须为正数")
     private Integer pageNum = 1;
 
+    @Valid
     @Positive(message = "每页数量必须为正数")
     private Integer pageSize = 10;
 

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

@@ -2,40 +2,30 @@ package com.bjtdba.userCenter.dto.request;
 
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.*;
 
 import java.math.BigDecimal;
 
 @Data
 public class UpdateUserInfoRequest {
-    @NotEmpty(message = "用户ID不能为空")
+    @Valid
+    @NotNull(message = "用户ID不能为空")
     private Integer uid;
+    @Valid
     @Pattern(regexp = "^1[3-9]\\d{9}$", message = "账号格式错误")
     private String account;
     private String realName;
     private String nickname;
+    private Integer sex;
     private Long spreadUid;
     private String avatar;
+    @Valid
     @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/dto/request/UserContributeModifyRequest.java

@@ -0,0 +1,47 @@
+
+package com.bjtdba.userCenter.dto.request;
+
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Data
+public class UserContributeModifyRequest {
+    @Valid
+    @NotNull(message = "用户ID不能为空")
+    private Integer uid;
+
+    private Integer merId;
+
+    @Valid
+    @NotNull(message = "贡献值不能为空")
+    @DecimalMin(value = "0.01", message = "贡献值必须大于0")
+    private BigDecimal number;
+
+    @Valid
+    @NotNull(message = "贡献值状态不能为空")
+    @Min(value = -1, message = "贡献值状态取值错误")
+    @Max(value = 1, message = "贡献值状态取值错误")
+    private Integer status; // '贡献值状态1-有效 0-失效 -1待确认'
+
+    private String mark;
+    private String desc;
+
+    @Valid
+    @NotBlank(message = "订单ID不能为空")
+    @Size(max = 255, message = "订单ID长度超限")
+    private String orderId;
+
+    @Valid
+    @NotBlank(message = "订单类型不能为空")
+    private String orderType;
+
+    @Valid
+    @NotNull(message = "贡献值类型不能为空")
+    @Min(value = 1, message = "贡献值类型取值错误")
+    @Max(value = 2, message = "贡献值类型取值错误")
+    private Integer type; // '贡献值状态1-有效 0-失效 -1待确认'
+}
+

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

@@ -1,6 +1,8 @@
 package com.bjtdba.userCenter.dto.request;
 
 import lombok.Data;
+
+import javax.validation.Valid;
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 
@@ -8,19 +10,23 @@ import java.math.BigDecimal;
 public class UserScoreModifyRequest {
     private Integer uid;
 
+    @Valid
     @NotNull(message = "积分类型不能为空")
     @Min(value = 1, message = "积分类型取值错误")
     @Max(value = 2, message = "积分类型取值错误")
     private Integer pm; // 1-收入 2-支出
 
+    @Valid
     @NotNull(message = "积分值不能为空")
     @DecimalMin(value = "0.01", message = "积分值必须大于0")
     private BigDecimal rewardScore;
 
+    @Valid
     @NotBlank(message = "订单ID不能为空")
     @Size(max = 255, message = "订单ID长度超限")
     private String orderId;
 
+    @Valid
     @NotBlank(message = "订单类型不能为空")
     private String orderType;
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/UserContributeModifyResponse.java

@@ -0,0 +1,14 @@
+package com.bjtdba.userCenter.dto.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Builder
+@Data
+public class UserContributeModifyResponse {
+    private Integer uid;
+    private BigDecimal currentContribute;
+    private String transactionId;
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/UserDTO.java

@@ -9,10 +9,11 @@ import java.sql.Timestamp;
 @Getter
 @Setter
 public class UserDTO {
-    private Long uid;
+    private Integer uid;
     private String account;
     private String realName;
     private String nickname;
+    private Integer sex;
     private Long spreadUid;
     private String avatar;
     private String phone;

userCenter_service/src/main/java/com/bjtdba/userCenter/entity/UserEntity.java

@@ -8,7 +8,7 @@ import java.util.Date;
 @Getter
 @Setter
 public class UserEntity {
-    private Long uid;
+    private Integer uid;
     private String wechatUserId;
     private String aliUserId;
     private String account;

userCenter_service/src/main/java/com/bjtdba/userCenter/entity/UserSignGongxianEntity.java

@@ -0,0 +1,79 @@
+package com.bjtdba.userCenter.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Data
+public class UserSignGongxianEntity {
+    /**
+     * 自增id
+     */
+    private Integer id;
+
+    /**
+     * 会员id
+     */
+    private int uid;
+
+    /**
+     * 商户id
+     */
+    private int merId;
+
+    /**
+     * 赠送数量
+     */
+    private BigDecimal number;
+
+    /**
+     * 贡献值状态: 1-有效, 0-失效, -1待确认
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String mark;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+    /**
+     * 剩余
+     */
+    private BigDecimal surplus;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 贡献值类型: 1赠送, 2消耗
+     */
+    private Integer type;
+
+    /**
+     * 结算时间
+     */
+    private Timestamp settlementTime;
+
+    /**
+     * 添加时间
+     */
+    private Long addtime;
+
+    /**
+     * pv值
+     */
+    private BigDecimal pv;
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/exception/BusinessException.java

@@ -26,14 +26,42 @@ public class BusinessException extends RuntimeException {
         return new BusinessException(404, "用户不存在");
     }
 
+    public static BusinessException userIsExist() {
+        return new BusinessException(500, "用户已存在");
+    }
+
+    public static BusinessException userAccountIsExist() {
+        return new BusinessException(500, "用户账号已存在");
+    }
+
     public static BusinessException insufficientScore() {
         return new BusinessException(403, "用户积分不足");
     }
 
-    public static BusinessException updateFailed() {
+    public static BusinessException updateScoreFailed() {
         return new BusinessException(500, "积分更新失败，请重试");
     }
 
+    public static BusinessException insufficientContribute() {
+        return new BusinessException(403, "用户贡献值不足");
+    }
+
+    public static BusinessException createContributeFailed() {
+        return new BusinessException(500, "贡献值记录创建失败，请重试");
+    }
+
+    public static BusinessException updateContributeFailed() {
+        return new BusinessException(500, "贡献值更新失败，请重试");
+    }
+
+    public static BusinessException createUserFailed() {
+        return new BusinessException(500, "创建用户信息失败");
+    }
+
+    public static BusinessException updateUserFailed() {
+        return new BusinessException(500, "更新用户信息失败");
+    }
+
     @Override
     public String getMessage() {
         return message;

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

@@ -2,9 +2,8 @@ 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.request.*;
+import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
 import com.bjtdba.userCenter.dto.response.UserDTO;
@@ -46,5 +45,9 @@ public interface UserService {
 
     UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request);
 
+    UserContributeModifyResponse modifyUserContribute(UserContributeModifyRequest request);
+
+    UserDTO createUserInfo(CreateUserInfoRequest request);
+
     UserDTO updateUserInfo(UpdateUserInfoRequest request);
 }

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

@@ -3,23 +3,26 @@ package com.bjtdba.userCenter.service.impl;
 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.request.*;
+import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
 import com.bjtdba.userCenter.dto.response.UserDTO;
 import com.bjtdba.userCenter.entity.UserEntity;
+import com.bjtdba.userCenter.entity.UserSignGongxianEntity;
 import com.bjtdba.userCenter.entity.UserSignScoreEntity;
 import com.bjtdba.userCenter.exception.BusinessException;
 import com.bjtdba.userCenter.service.UserService;
+import com.bjtdba.userCenter.util.PasswordUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Collections;
@@ -39,6 +42,10 @@ public class UserServiceImpl  implements UserService {
     private UserDao userDao;
     @Autowired
     private UserSignScoreDao userSignScoreDao;
+    @Autowired
+    private UserSignGongxianDao userSignGongxianDao;
+    @Autowired
+    private HttpServletRequest httpServletRequest;
 
 
     public User queryByid(Integer uid){
@@ -108,16 +115,17 @@ public class UserServiceImpl  implements UserService {
             return Collections.emptyList();
         }
         return userEntityList.stream()
-                .map(this::convertToBasicDTO)
+                .map(this::convertToUserDTO)
                 .collect(Collectors.toList());
     }
 
-    private UserDTO convertToBasicDTO(UserEntity userEntity) {
+    private UserDTO convertToUserDTO(UserEntity userEntity) {
         UserDTO dto = new UserDTO();
         dto.setUid(userEntity.getUid());
         dto.setAccount(userEntity.getAccount());
         dto.setRealName(userEntity.getRealName());
         dto.setNickname(userEntity.getNickname());
+        dto.setSex(userEntity.getSex());
         dto.setSpreadUid(userEntity.getSpreadUid());
         dto.setAvatar(userEntity.getAvatar());
         dto.setPhone(userEntity.getPhone());
@@ -163,7 +171,7 @@ public class UserServiceImpl  implements UserService {
                 newScore
         );
         if (updateCount == 0) {
-            throw BusinessException.updateFailed();
+            throw BusinessException.updateScoreFailed();
         }
 
         // 4. 创建积分记录
@@ -178,6 +186,7 @@ public class UserServiceImpl  implements UserService {
                 .build();
     }
 
+
     private UserSignScoreEntity buildScoreRecord(UserScoreModifyRequest request, BigDecimal currentScore) {
         UserSignScoreEntity record = new UserSignScoreEntity();
         record.setUid(request.getUid());
@@ -200,16 +209,155 @@ public class UserServiceImpl  implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public UserDTO updateUserInfo(UpdateUserInfoRequest request) {
+    public UserContributeModifyResponse modifyUserContribute(UserContributeModifyRequest request) {
         // 1. 获取用户并加锁
         UserEntity userEntity = userDao.getUserInfoByUidForUpdate(request.getUid());
         if (userEntity == null) {
             throw BusinessException.userNotFound();
         }
 
-        // 2. 判断积分值是否有变动
+        // 2. 贡献值操作处理
+        BigDecimal newContribute;
+        if (request.getType() == 1) {  // 赠送
+            newContribute = userEntity.getContribute().add(request.getNumber());
+        } else {  // 消耗
+            if (userEntity.getContribute().compareTo(request.getNumber()) < 0) {
+                throw BusinessException.insufficientContribute();
+            }
+            newContribute = userEntity.getScore().subtract(request.getNumber());
+        }
+
+        // 3. 更新用户贡献值（带乐观锁）
+        int updateCount = userDao.updateUserContribute(
+                request.getUid(),
+                newContribute
+        );
+        if (updateCount == 0) {
+            throw BusinessException.updateContributeFailed();
+        }
+
+        // 4. 创建贡献值记录
+        UserSignGongxianEntity record = buildContributeRecord(request, newContribute);
+        int createResult = userSignGongxianDao.insertByEntity(record);
+        if (createResult == 0) {
+            throw BusinessException.createContributeFailed();
+        }
+
+        // 5. 构建响应
+        return UserContributeModifyResponse.builder()
+                .uid(request.getUid())
+                .currentContribute(newContribute)
+                .transactionId(record.getId().toString())
+                .build();
+    }
+
+    private UserSignGongxianEntity buildContributeRecord(UserContributeModifyRequest request, BigDecimal newContribute) {
+        UserSignGongxianEntity record = new UserSignGongxianEntity();
+        record.setUid(request.getUid());
+        record.setMerId(request.getMerId());
+        record.setNumber(request.getNumber());
+        record.setStatus(request.getStatus());
+        record.setMark(buildContributeMark(request));
+        record.setDesc(request.getDesc());
+        record.setOrderId(request.getOrderId());
+        record.setOrderType(request.getOrderType());
+        record.setSurplus(newContribute);
+        record.setType(request.getType());
+        if (request.getStatus() == 1) {
+            record.setSettlementTime(Timestamp.valueOf(LocalDateTime.now()));
+        }
+        record.setAddtime(LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+        return record;
+    }
+
+    private String buildContributeMark(UserContributeModifyRequest request) {
+        return String.format("%s贡献值，订单号：%s",
+                request.getType() == 1 ? "收入" : "支出",
+                request.getOrderId());
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserDTO createUserInfo(CreateUserInfoRequest request) {
+        // 1. 获取用户并加锁
+        UserEntity userEntity = userDao.getUserInfoByAccount(request.getAccount());
+        if (userEntity != null) {
+            throw BusinessException.userIsExist();
+        }
+        userEntity = new UserEntity();
+        userEntity.setAccount(request.getAccount());
+        userEntity.setPhone(request.getPhone());
+        userEntity.setPwd(PasswordUtil.hashPassword("123456"));
+        userEntity.setNickname(request.getNickname());
+        userEntity.setRealName(request.getRealName());
+        userEntity.setAvatar("https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png");
+        userEntity.setSpreadUid(request.getSpreadUid());
+        userEntity.setSex(request.getSex());
+        userEntity.setExternal(request.getExternal());
+        userEntity.setExternalId(request.getExternalId());
+        userEntity.setLevelId(request.getLevelId());
+        // 设置系统默认值
+        userEntity.setCreateTime(new Timestamp(System.currentTimeMillis()));
+        userEntity.setLastTime(new Timestamp(System.currentTimeMillis()));
+        userEntity.setLastIp(request.getLastIp());
+        userEntity.setStatus(1); // 默认状态：正常
+        userEntity.setIsDel(0); // 未删除
+        userEntity.setScore(BigDecimal.ZERO); // 默认积分
+        userEntity.setUserType(httpServletRequest.getHeader("X-API-KEY"));
+        int uid = userDao.insertUserByUserEntity(userEntity);
+        if (uid <= 0) {
+            throw BusinessException.createUserFailed();
+        }
+        return convertToUserDTO(userEntity);
+    }
 
 
-        return null;
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserDTO updateUserInfo(UpdateUserInfoRequest request) {
+        // 1. 获取用户并加锁
+        UserEntity userEntity = userDao.getUserInfoByUidForUpdate(request.getUid());
+        if (userEntity == null) {
+            // 如果用户不存在则创建
+            throw BusinessException.userNotFound();
+        }
+        UserEntity userEntityByAccount = userDao.getUserInfoByAccount(request.getAccount());
+        if (userEntityByAccount != null && !userEntityByAccount.getUid().equals(request.getUid())) {
+            throw BusinessException.userAccountIsExist();
+        }
+        // 只更新非空字段（根据业务需求调整）
+        if (request.getAccount() != null) {
+            userEntity.setAccount(request.getAccount());
+        }
+        if (request.getPhone() != null) {
+            userEntity.setPhone(request.getPhone());
+        }
+        if (request.getNickname() != null) {
+            userEntity.setNickname(request.getNickname());
+        }
+        if (request.getRealName() != null) {
+            userEntity.setRealName(request.getRealName());
+        }
+        if (request.getAvatar() != null) {
+            userEntity.setAvatar(request.getAvatar());
+        }
+        if (request.getSpreadUid() != null) {
+            userEntity.setSpreadUid(request.getSpreadUid());
+        }
+        if (request.getSex() != null) {
+            userEntity.setSex(request.getSex());
+        }
+        if (request.getLevelId() != null) {
+            userEntity.setLevelId(request.getLevelId());
+        }
+        // 更新最后活跃时间
+        userEntity.setLastTime(new Timestamp(System.currentTimeMillis()));
+        // 执行更新操作
+        int updateCount = userDao.updateUserByUid(userEntity);
+        if (updateCount <= 0) {
+            throw BusinessException.updateUserFailed();
+        }
+        return convertToUserDTO(userEntity);
     }
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/util/PasswordUtil.java

@@ -0,0 +1,18 @@
+package com.bjtdba.userCenter.util;
+
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+public class PasswordUtil {
+
+    private static final BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+
+    // 生成密码哈希（对应PHP的password_hash）
+    public static String hashPassword(String password) {
+        return encoder.encode(password);
+    }
+
+    // 验证密码（对应PHP的password_verify）
+    public static boolean verifyPassword(String password, String hashedPassword) {
+        return encoder.matches(password, hashedPassword);
+    }
+}

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

@@ -61,9 +61,86 @@
         WHERE is_del = 0 AND uid = #{uid} FOR UPDATE
     </select>
 
+    <select id="getUserInfoByAccount" resultMap="userResultMap">
+        SELECT <include refid="baseColumn"/>
+        FROM rrx_user
+        WHERE is_del = 0 AND account = #{account}
+    </select>
+
     <update id="updateUserScore">
         UPDATE rrx_user SET
                         score = #{newScore}
         WHERE uid = #{uid}
     </update>
+
+    <update id="updateUserContribute">
+        UPDATE rrx_user SET
+            contribute = #{newContribute}
+        WHERE uid = #{uid}
+    </update>
+
+    <insert id="insertUserByUserEntity" useGeneratedKeys="true" keyProperty="userEntity.uid" keyColumn="uid">
+        INSERT INTO rrx_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userEntity.account != null">account,</if>
+            <if test="userEntity.phone != null">phone,</if>
+            <if test="userEntity.pwd != null">pwd,</if>
+            <if test="userEntity.nickname != null">nickname,</if>
+            <if test="userEntity.realName != null">real_name,</if>
+            <if test="userEntity.avatar != null">avatar,</if>
+            <if test="userEntity.spreadUid != null">spread_uid,</if>
+            <if test="userEntity.sex != null">sex,</if>
+            <if test="userEntity.external != null">external,</if>
+            <if test="userEntity.externalId != null">external_id,</if>
+            <if test="userEntity.birthday != null">birthday,</if>
+            <if test="userEntity.levelId != null">level_id,</if>
+            <if test="userEntity.mark != null">mark,</if>
+            <if test="userEntity.createTime != null">create_time,</if>
+            <if test="userEntity.lastTime != null">last_time,</if>
+            <if test="userEntity.lastIp != null">last_ip,</if>
+            <if test="userEntity.isDel != null">is_del,</if>
+            <if test="userEntity.identityUpTime != null">identity_up_time,</if>
+            <if test="userEntity.userType != null">user_type,</if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="userEntity.account != null">#{userEntity.account},</if>
+            <if test="userEntity.phone != null">#{userEntity.phone},</if>
+            <if test="userEntity.pwd != null">#{userEntity.pwd},</if>
+            <if test="userEntity.nickname != null">#{userEntity.nickname},</if>
+            <if test="userEntity.realName != null">#{userEntity.realName},</if>
+            <if test="userEntity.avatar != null">#{userEntity.avatar},</if>
+            <if test="userEntity.spreadUid != null">#{userEntity.spreadUid},</if>
+            <if test="userEntity.sex != null">#{userEntity.sex},</if>
+            <if test="userEntity.external != null">#{userEntity.external},</if>
+            <if test="userEntity.externalId != null">#{userEntity.externalId},</if>
+            <if test="userEntity.birthday != null">#{userEntity.birthday},</if>
+            <if test="userEntity.levelId != null">#{userEntity.levelId},</if>
+            <if test="userEntity.mark != null">#{userEntity.mark},</if>
+            <if test="userEntity.createTime != null">#{userEntity.createTime},</if>
+            <if test="userEntity.lastTime != null">#{userEntity.lastTime},</if>
+            <if test="userEntity.lastIp != null">#{userEntity.lastIp},</if>
+            <if test="userEntity.isDel != null">#{userEntity.isDel},</if>
+            <if test="userEntity.identityUpTime != null">#{userEntity.identityUpTime},</if>
+            <if test="userEntity.userType != null">#{userEntity.userType},</if>
+        </trim>
+    </insert>
+
+    <update id="updateUserByUid">
+        UPDATE rrx_user
+        <set>
+            <if test="account != null">account = #{account},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="nickname != null">nickname = #{nickname},</if>
+            <if test="realName != null">real_name = #{realName},</if>
+            <if test="avatar != null">avatar = #{avatar},</if>
+            <if test="spreadUid != null">spread_uid = #{spreadUid},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="external != null">external = #{external},</if>
+            <if test="externalId != null">external_id = #{externalId},</if>
+            <if test="levelId != null">level_id = #{levelId},</if>
+            <if test="lastTime != null">last_time = #{lastTime},</if>
+            <!-- 添加其他需要更新的字段 -->
+        </set>
+        WHERE uid = #{uid}
+    </update>
 </mapper>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bjtdba.userCenter.dao.UserSignGongxianDao">
+
+    <!-- 使用 autoMapping 自动映射未显式声明的字段 -->
+    <resultMap id="userSignGongxianResultMap" type="com.bjtdba.userCenter.entity.UserSignGongxianEntity" autoMapping="true">
+        <id column="uid" property="uid" />
+        <!-- 显式声明需要下划线转驼峰的字段 -->
+        <result column="mer_id" property="merId" />
+        <result column="order_type" property="orderType" />
+        <result column="order_id" property="orderId" />
+        <result column="settlement_time" property="settlementTime" />
+    </resultMap>
+    
+    <insert id="insertByEntity" useGeneratedKeys="true" keyProperty="userSignGongxianEntity.id" keyColumn="id">
+        INSERT INTO rrx_user_sign_gongxian
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userSignGongxianEntity.uid != null">uid,</if>
+            <if test="userSignGongxianEntity.merId != null">mer_id,</if>
+            <if test="userSignGongxianEntity.number != null">number,</if>
+            <if test="userSignGongxianEntity.status != null">status,</if>
+            <if test="userSignGongxianEntity.mark != null">mark,</if>
+            <if test="userSignGongxianEntity.desc != null">`desc`,</if>
+            <if test="userSignGongxianEntity.orderId != null">order_id,</if>
+            <if test="userSignGongxianEntity.surplus != null">surplus,</if>
+            <if test="userSignGongxianEntity.orderType != null">order_type,</if>
+            <if test="userSignGongxianEntity.type != null">type,</if>
+            <if test="userSignGongxianEntity.settlementTime != null">settlement_time,</if>
+            <if test="userSignGongxianEntity.addtime != null">addtime,</if>
+            <if test="userSignGongxianEntity.pv != null">pv,</if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="userSignGongxianEntity.uid != null">#{userSignGongxianEntity.uid},</if>
+            <if test="userSignGongxianEntity.merId != null">#{userSignGongxianEntity.merId},</if>
+            <if test="userSignGongxianEntity.number != null">#{userSignGongxianEntity.number},</if>
+            <if test="userSignGongxianEntity.status != null">#{userSignGongxianEntity.status},</if>
+            <if test="userSignGongxianEntity.mark != null">#{userSignGongxianEntity.mark},</if>
+            <if test="userSignGongxianEntity.desc != null">#{userSignGongxianEntity.desc},</if>
+            <if test="userSignGongxianEntity.orderId != null">#{userSignGongxianEntity.orderId},</if>
+            <if test="userSignGongxianEntity.surplus != null">#{userSignGongxianEntity.surplus},</if>
+            <if test="userSignGongxianEntity.orderType != null">#{userSignGongxianEntity.orderType},</if>
+            <if test="userSignGongxianEntity.type != null">#{userSignGongxianEntity.type},</if>
+            <if test="userSignGongxianEntity.settlementTime != null">#{userSignGongxianEntity.settlementTime},</if>
+            <if test="userSignGongxianEntity.addtime != null">#{userSignGongxianEntity.addtime},</if>
+            <if test="userSignGongxianEntity.pv != null">#{userSignGongxianEntity.pv},</if>
+        </trim>
+    </insert>
+    
+</mapper>