增加第三方接口-新增修改用户积分接口

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

@@ -0,0 +1,46 @@
+package com.bjtdba.userCenter.advice;
+
+
+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.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    /**
+     * 处理业务异常
+     */
+    @ExceptionHandler(BusinessException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiResponse<Void> handleBusinessException(BusinessException e) {
+        return ApiResponse.error(e.getCode(), e.getMessage());
+    }
+
+    /**
+     * 处理参数校验异常
+     */
+    @ExceptionHandler(BindException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiResponse<Void> handleValidationException(BindException e) {
+        String errorMsg = e.getBindingResult().getFieldErrors().stream()
+                .map(fieldError -> fieldError.getField() + ": " + fieldError.getDefaultMessage())
+                .findFirst()
+                .orElse("参数校验失败");
+        return ApiResponse.error(400, errorMsg);
+    }
+
+    /**
+     * 处理其他未捕获异常
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public ApiResponse<Void> handleException(Exception e) {
+        // 生产环境应记录日志而不是返回详细错误信息
+        return ApiResponse.error(500, "系统繁忙，请稍后再试");
+    }
+}

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

@@ -6,6 +6,9 @@ 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.UserScoreModifyRequest;
+import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
+import com.bjtdba.userCenter.dto.response.common.ApiResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
 import com.bjtdba.userCenter.dto.response.UserDTO;
 import com.bjtdba.userCenter.service.UserAddressService;
@@ -17,6 +20,7 @@ import com.bjtdba.userCenter.vo.UserInfoVo;
 import com.bjtdba.utils.ResponseUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -603,4 +607,12 @@ public class UserController {
     public ResponseEntity<PageResult<UserDTO>> getUserList(@Valid GetUserListRequest request) {
         return ResponseEntity.ok(userService.getUserList(request));
     }
+
+    @PostMapping("/{uid}/score")
+    public ApiResponse<UserScoreModifyResponse> modifyUserScore(
+            @PathVariable Integer uid,
+            @Validated @RequestBody UserScoreModifyRequest request) {
+        request.setUid(uid); // 确保路径参数和body一致
+        return ApiResponse.success(userService.modifyUserScore(request));
+    }
 }

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

@@ -54,4 +54,9 @@ public interface UserDao {
             @Param("uid") Long uid,
             @Param("status") Integer status
     );
+
+    UserEntity getUserScoreByUidForUpdate(@Param("uid") Integer uid);
+
+    int updateUserScore(@Param("uid") Integer uid,
+                        @Param("newScore") BigDecimal newScore);
 }

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

@@ -1,6 +1,7 @@
 package com.bjtdba.userCenter.dao;
 
 import com.bjtdba.entity.userCenter.UserSignScore;
+import com.bjtdba.userCenter.entity.UserSignScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -90,5 +91,7 @@ public interface UserSignScoreDao {
      */
     int deleteById(Integer id);
 
+    int insertByEntity(UserSignScoreEntity record);
+
 }
 

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

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

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/UserScoreModifyResponse.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 UserScoreModifyResponse {
+    private Integer uid;
+    private BigDecimal currentScore;
+    private String transactionId;
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/common/ApiResponse.java

@@ -0,0 +1,25 @@
+package com.bjtdba.userCenter.dto.response.common;
+
+import lombok.Data;
+
+@Data
+public class ApiResponse<T> {
+    private int code;
+    private String message;
+    private T data;
+
+    public static <T> ApiResponse<T> success(T data) {
+        ApiResponse<T> response = new ApiResponse<>();
+        response.setCode(200);
+        response.setMessage("操作成功");
+        response.setData(data);
+        return response;
+    }
+
+    public static ApiResponse<Void> error(int code, String message) {
+        ApiResponse<Void> response = new ApiResponse<>();
+        response.setCode(code);
+        response.setMessage(message);
+        return response;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.bjtdba.userCenter.entity;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class UserSignScoreEntity {
+    private Integer id;
+    private Integer uid;
+    private Integer continuityDay;
+    private BigDecimal rewardScore;
+    private LocalDateTime signinTime;
+    private Integer sourceUid = 0;
+    private Integer status = 0;
+    private String mark;
+    private String orderId;
+    private Integer pm = 1;
+    private BigDecimal surplus;
+    private String orderType;
+    private Long addtime;
+    private Integer sourceType = 1;
+    private LocalDateTime settlementTime;
+}

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

@@ -0,0 +1,41 @@
+package com.bjtdba.userCenter.exception;
+
+import lombok.Getter;
+
+public class BusinessException extends RuntimeException {
+    @Getter
+    private final int code;
+    private final String message;
+
+    public BusinessException(int code, String message) {
+        super(message);
+        this.code = code;
+        this.message = message;
+    }
+
+    public BusinessException(String message) {
+        this(400, message); // 默认400错误码
+    }
+
+    // 常用的预定义异常
+    public static BusinessException of(String message) {
+        return new BusinessException(message);
+    }
+
+    public static BusinessException userNotFound() {
+        return new BusinessException(404, "用户不存在");
+    }
+
+    public static BusinessException insufficientScore() {
+        return new BusinessException(403, "用户积分不足");
+    }
+
+    public static BusinessException updateFailed() {
+        return new BusinessException(500, "积分更新失败，请重试");
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

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

@@ -3,6 +3,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.UserScoreModifyRequest;
+import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
 import com.bjtdba.userCenter.dto.response.UserDTO;
 
@@ -40,4 +42,6 @@ public interface UserService {
     public BigDecimal getUserCommission(Integer uid);
 
     PageResult<UserDTO> getUserList(GetUserListRequest request);
+
+    UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request);
 }

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

@@ -2,25 +2,31 @@ package com.bjtdba.userCenter.service.impl;
 
 import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
-import com.bjtdba.userCenter.dao.MerchantDao;
-import com.bjtdba.userCenter.dao.UserBillDao;
-import com.bjtdba.userCenter.dao.UserDao;
-import com.bjtdba.userCenter.dao.UserInfoDao;
+import com.bjtdba.userCenter.dao.*;
 import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
+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.UserSignScoreEntity;
+import com.bjtdba.userCenter.exception.BusinessException;
 import com.bjtdba.userCenter.service.UserService;
+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 java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service("userService")
+@RequiredArgsConstructor
 public class UserServiceImpl  implements UserService {
     @Autowired
     private UserInfoDao userInfoDao;
@@ -30,6 +36,8 @@ public class UserServiceImpl  implements UserService {
     private UserBillDao userBillDao;
     @Autowired
     private UserDao userDao;
+    @Autowired
+    private UserSignScoreDao userSignScoreDao;
 
 
     public User queryByid(Integer uid){
@@ -127,4 +135,64 @@ public class UserServiceImpl  implements UserService {
         dto.setPv(userEntity.getPv());
         return dto;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request) {
+        // 1. 获取用户并加锁
+        UserEntity userEntity = userDao.getUserScoreByUidForUpdate(request.getUid());
+        if (userEntity == null) {
+            throw BusinessException.userNotFound();
+        }
+
+        // 2. 积分操作处理
+        BigDecimal newScore;
+        if (request.getPm() == 1) {  // 收入
+            newScore = userEntity.getScore().add(request.getRewardScore());
+        } else {  // 支出
+            if (userEntity.getScore().compareTo(request.getRewardScore()) < 0) {
+                throw BusinessException.insufficientScore();
+            }
+            newScore = userEntity.getScore().subtract(request.getRewardScore());
+        }
+
+        // 3. 更新用户积分（带乐观锁）
+        int updateCount = userDao.updateUserScore(
+                request.getUid(),
+                newScore
+        );
+        if (updateCount == 0) {
+            throw BusinessException.updateFailed();
+        }
+
+        // 4. 创建积分记录
+        UserSignScoreEntity record = buildScoreRecord(request, newScore);
+        userSignScoreDao.insertByEntity(record);
+
+        // 5. 构建响应
+        return UserScoreModifyResponse.builder()
+                .uid(request.getUid())
+                .currentScore(newScore)
+                .transactionId(record.getId().toString())
+                .build();
+    }
+
+    private UserSignScoreEntity buildScoreRecord(UserScoreModifyRequest request, BigDecimal currentScore) {
+        UserSignScoreEntity record = new UserSignScoreEntity();
+        record.setUid(request.getUid());
+        record.setRewardScore(request.getRewardScore());
+        record.setPm(request.getPm());
+        record.setOrderId(request.getOrderId());
+        record.setOrderType(request.getOrderType());
+        record.setSurplus(currentScore);
+        record.setAddtime(LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+        record.setMark(buildRecordMark(request));
+        return record;
+    }
+
+    private String buildRecordMark(UserScoreModifyRequest request) {
+        return String.format("%s积分，订单号：%s",
+                request.getPm() == 1 ? "收入" : "支出",
+                request.getOrderId());
+    }
 }

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

@@ -54,4 +54,16 @@
         FROM rrx_user
         <include refid="queryCondition"/>
     </select>
+
+    <select id="getUserScoreByUidForUpdate" resultMap="userResultMap">
+        SELECT uid, score
+        FROM rrx_user
+        WHERE uid = #{uid} FOR UPDATE
+    </select>
+
+    <update id="updateUserScore">
+        UPDATE rrx_user SET
+                        score = #{newScore}
+        WHERE uid = #{uid}
+    </update>
 </mapper>

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

@@ -203,5 +203,15 @@
         delete from rrx_user_sign_score where id = #{id}
     </delete>
 
+
+    <insert id="insertByEntity" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO rrx_user_sign_score (
+            uid, reward_socre, pm, order_id, order_type,
+            surplus, mark, status, addtime
+        ) VALUES (
+                     #{uid}, #{rewardScore}, #{pm}, #{orderId}, #{orderType},
+                     #{surplus}, #{mark}, 1, #{addtime}
+                 )
+    </insert>
 </mapper>