diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 09d9814..795f507 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -111,10 +111,10 @@ public class User implements UserDetails { private Integer points; @ApiModelProperty("用户总支付的金额") - private String payMoney; + private BigDecimal payMoney; @ApiModelProperty("实际消费的金额(不含退款)") - private String expendMoney; + private BigDecimal expendMoney; @ApiModelProperty("会员等级ID") private Integer gradeId; diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java index 5ffb718..799017f 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java @@ -410,6 +410,12 @@ public class PaymentController extends BaseController { order.setBatteryRent(parentOrder.getBatteryRent()); orderPayService.updateById(order); orderService.updateById(parentOrder); + + //更新消费金额 + User user = userService.getById(order.getUserId()); + user.setPayMoney(user.getPayMoney().add(new BigDecimal(payPrice))); + user.setExpendMoney(user.getExpendMoney().add(new BigDecimal(payPrice))); + userService.updateById(user); return "success"; } // TODO 验签失败则记录异常日志,并在response中返回failure. @@ -449,7 +455,9 @@ public class PaymentController extends BaseController { // 2. 扣除余额操作 BigDecimal subtract = balance.subtract(payPrice); user.setBalance(subtract); - userService.updateById(user); + user.setPayMoney(user.getPayMoney().add(payPrice)); + user.setExpendMoney(user.getExpendMoney().add(payPrice)); + userService.updateById(user);//FIXME 这里在未确定keep成功的情况下就扣了 // 3. 记录余额明细 UserBalanceLog userBalanceLog = new UserBalanceLog(); userBalanceLog.setUserId(userId); @@ -535,6 +543,8 @@ public class PaymentController extends BaseController { // 2. 扣除余额操作 BigDecimal subtract = balance.subtract(payPrice); user.setBalance(subtract); + user.setPayMoney(user.getPayMoney().add(payPrice)); + user.setExpendMoney(user.getExpendMoney().add(payPrice)); userService.updateById(user); // 3. 记录余额明细 UserBalanceLog userBalanceLog = new UserBalanceLog();