Browse Source

Merge remote-tracking branch 'origin/milestone-20260327-金币日常优化2.0' into milestone-20260327-金币日常优化3.0

lijianlin/feature-20260225-金币钱包体系
wangguorui 1 week ago
parent
commit
765819af5f
  1. 1
      src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java
  2. 7
      src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

1
src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@ -920,6 +920,7 @@ public class MysqlServiceImpl implements MysqlService {
case 7 -> 4; // 其他 西南钱包
case 10 -> 8;
case 15 -> 3;
case 16 -> 6;
default -> 1;
};
}

7
src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@ -476,6 +476,13 @@ public class CashRefundServiceImpl implements RefundService {
user.setCurrentPermanentGold(BigDecimal.valueOf(-userGoldRecord.getPermanentGold())); //当前永久金币
user.setCurrentFreeJune(BigDecimal.valueOf(-userGoldRecord.getFreeJune())); //当前六月免费金币
user.setCurrentFreeDecember(BigDecimal.valueOf(-userGoldRecord.getFreeDecember())); //当前十二月免费金币
User usergold = userMapper.selectUserByJwcode(userGoldRecord.getJwcode());
if(usergold.getCurrentFreeJune().add(user.getCurrentFreeJune()).compareTo(BigDecimal.ZERO)<0){
throw new RuntimeException("当前六月免费金币不足");
}
if (usergold.getCurrentFreeDecember().add(user.getCurrentFreeDecember()).compareTo(BigDecimal.ZERO)<0){
throw new RuntimeException("当前十二月免费金币不足");
}
auditMapper.updateUserGold(user);
// 钱包更新 - 按原始充值流水 wallet_id 优先级顺序原路退回1-10越小优先级越高

Loading…
Cancel
Save