diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java index 1df32ae..a9d88a1 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java @@ -107,12 +107,12 @@ public class AppUserMoneyController { BigDecimal outgoing = new BigDecimal(outgoingLong); BigDecimal balance = income.subtract(outgoing); - BigDecimal ktxje = userMoney.getMoney().subtract(balance); - if(ktxje.compareTo(BigDecimal.ZERO) < 0){ - ktxje = BigDecimal.ZERO; +// BigDecimal ktxje = userMoney.getMoney().subtract(balance); + if(balance.compareTo(BigDecimal.ZERO) < 0){ + balance = BigDecimal.ZERO; } //插入可提现金额 - userMoneyResult.setWithdrawableAmount(ktxje); + userMoneyResult.setWithdrawableAmount(balance); return Result.success().put("data",userMoneyResult); } diff --git a/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java b/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java index 7ccfc08..aa1c250 100644 --- a/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java @@ -596,6 +596,8 @@ public class SelfOrdersServiceImpl implements OrdersService { userMoneyDetails.setType(2); userMoneyDetails.setMoney(BigDecimal.valueOf(payMoney)); userMoneyDetails.setCreateTime(date); + userMoneyDetails.setBlRole(2); + userMoneyDetails.setBlFlag(1); userMoneyDetailsService.save(userMoneyDetails); //订单分销 this.fenXiao(orders);