diff --git a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java index 0ba4b69..9d8059f 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java @@ -41,10 +41,10 @@ public class RechargeUser { @ExcelProperty("汇率ID") private Integer rateId; // 汇率ID - @ExcelProperty("汇率名称") + @ExcelProperty("货币名称") private String rateName; // 汇率名称 - @ExcelProperty("金额") + @ExcelProperty("充值金额") private BigDecimal money; // 金额[分] @ExcelProperty("永久金币") @@ -56,8 +56,8 @@ public class RechargeUser { @ExcelProperty("支付方式") private String payModel; // 支付方式 - @ExcelProperty("支付平台") - private String payPlatform; // 支付平台 + @ExcelProperty("充值方式") + private String payPlatform; // 充值方式 @ExcelProperty("支付凭证") private String voucher; // 支付凭证 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index 6adf243..ac8c6af 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -163,7 +163,9 @@ public class ConsumeServiceImpl implements ConsumeService { user.setCurrentFreeDecember(BigDecimal.valueOf(gold.getNowFreeDecember().intValue() + userGoldRecord.getFreeDecember())); user.setCurrentTaskGold(BigDecimal.valueOf(gold.getNowTaskGold().intValue() - consumeUser.getTaskGold().intValue())); user.setConsumeNum(gold.getConsumeNum().intValue() + 1); - user.setSumConsume(-(consumeUser.getPermanentGold().intValue() + consumeUser.getFreeGold().intValue() + consumeUser.getTaskGold().intValue())); + user.setSumConsumePermanent(BigDecimal.valueOf(-consumeUser.getPermanentGold().intValue())); + user.setSumConsumeFree(BigDecimal.valueOf(-consumeUser.getFreeGold().intValue())); + user.setSumConsumeTask(BigDecimal.valueOf(-consumeUser.getTaskGold().intValue())); userMapper.updateGold(user); // if(consumeUser.getJwcode().equals(94226013)){ GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65,