Browse Source

Merge remote-tracking branch 'origin/milestone-20251203-冲刺计划' into milestone-20251203-冲刺计划

milestone-20251205-消费
sunjiabei 1 month ago
parent
commit
4cc2d4849f
  1. 2
      src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java
  2. 11
      src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

2
src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java

@ -123,7 +123,7 @@ public class AuditServiceImpl implements AuditService {
try {
BigDecimal sum = BigDecimal.valueOf(
order.getPermanentGold())
.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP) ;
redService.addAmount(order.getJwcode(), sum, 1); // 直接调你写好的方法
} catch (Exception e) {

11
src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java

@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@ -195,6 +196,16 @@ public class ConsumeServiceImpl implements ConsumeService {
user.setSumConsumeTask(BigDecimal.valueOf(-consumeUser.getTaskGold().intValue()));
userMapper.updateGold(user);
//累消
try {
BigDecimal sum = (consumeUser.getSumGold()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP );
redService.addAmount(consumeUser.getJwcode(),sum, 2);
}catch (Exception e){
log.warn("消耗累加失败,主流程继续 | jwcode={}", consumeUser.getJwcode(), e);
}
redService.sendJwcode(consumeUser.getJwcode());
// }
return Result.success();

Loading…
Cancel
Save