【feat】【v3】

1.完善表设计
2.增加和修改奖励相关逻辑
3.增加账户相关逻辑

1.完善逻辑

src/main/java/com/punchsettle/server/atomic/entity/RewardExchangeHistory.java

@@ -61,6 +61,12 @@ public class RewardExchangeHistory extends BaseEntity implements Serializable {
     @Column(name = "account_id")
     private Long accountId;
 
+    /**
+     * 兑换使用的账户名称
+     */
+    @Column(name = "account_name")
+    private String accountName;
+
     /**
      * 兑换前账户中的积分
      */

src/main/java/com/punchsettle/server/service/manager/impl/PunchInManagerImpl.java

@@ -549,9 +549,7 @@ public class PunchInManagerImpl implements IPunchInManager {
         }
 
         if (Objects.isNull(statPiTask)) {
-             PiTaskStatVO piTaskStatVO = new PiTaskStatVO();
-             piTaskStatVO.setPiTaskHistoryStatVOS(List.of());
-             return piTaskStatVO;
+             return null;
         }
 
         // 查询打卡记录

src/main/java/com/punchsettle/server/service/manager/impl/RewardManagerImpl.java

@@ -176,7 +176,7 @@ public class RewardManagerImpl implements IRewardManager {
         User user = Optional.ofNullable(userService.getById(UserUtils.getCurrentUserId())).orElseThrow(() -> BusinessException.fail("无法查询到当前用户信息"));
         // 兑换前未使用积分
         Integer unusedPointsBeforeExchange = Optional.ofNullable(user.getUnusedPoints()).orElse(0);
-        if (exchangeTotalPoints.compareTo(unusedPointsBeforeExchange) < 0) {
+        if (unusedPointsBeforeExchange.compareTo(exchangeTotalPoints) < 0) {
             BusinessException.throwFail("用户积分不足，无法兑换");
         }
         // 兑换前已使用积分
@@ -194,6 +194,7 @@ public class RewardManagerImpl implements IRewardManager {
         addRewardExchangeHistory.setExchangeCount(request.getExchangeCount());
         addRewardExchangeHistory.setExchangeTotalPoints(exchangeTotalPoints);
         addRewardExchangeHistory.setAccountId(account.getId());
+        addRewardExchangeHistory.setAccountName(account.getAccountName());
         addRewardExchangeHistory.setAccountPointsBeforeExchange(accountPointsBeforeExchange);
         addRewardExchangeHistory.setAccountPointsAfterExchange(accountPointsAfterExchange);
         addRewardExchangeHistory.setUnusedPointsBeforeExchange(unusedPointsBeforeExchange);