diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java index d1475e8..9c6ce48 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/OmsPortalOrderServiceImpl.java @@ -1578,6 +1578,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { umsMemberAccountTransactionMapper.insert(accountTransaction); PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn()); + if (pmsProduct.getVipStatus() == 1) { + //增加基金现金 + BigDecimal fundCash = payAmount.multiply(new BigDecimal("0.05")); + umsDevelopmentFundMapper.updateCash(fundCash); + } + //如果是积分专区的商品则进行积分专区相对应的逻辑 if (pmsProduct.getPointsAreaStatus() == 1) { //奖励积分是购买的价格的100% diff --git a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java index b86102d..0cd298f 100644 --- a/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java +++ b/mall-portal/src/main/java/com/buy507/mall/portal/service/impl/UmsMemberServiceImpl.java @@ -928,7 +928,7 @@ public class UmsMemberServiceImpl implements UmsMemberService { String withdrawMultipleStr = commonService.getDictionaryValue(Constants.D_WITHDRAW_MULTIPLE); double withdrawMultiple = Double.valueOf(withdrawMultipleStr); if(applyParam.getValue() % withdrawMultiple != 0) { - return CommonResult.validateFailed("提现积分必须是" + withdrawMultipleStr + "的倍数"); + return CommonResult.validateFailed("提现金额必须是" + withdrawMultipleStr + "的倍数"); } BigDecimal withdraw = new BigDecimal(applyParam.getValue()); @@ -937,7 +937,7 @@ public class UmsMemberServiceImpl implements UmsMemberService { //flag = -1,表示balance小于withdraw;flag = 0,表示balance等于withdraw;flag = 1,表示balance大于withdraw; int flag = member.getBalance().compareTo(withdraw); if(flag == -1) { - return CommonResult.validateFailed("积分不足,不能提现"); + return CommonResult.validateFailed("余额不足,不能提现"); } while(true) { @@ -947,7 +947,7 @@ public class UmsMemberServiceImpl implements UmsMemberService { //flag = -1,表示balance小于withdraw;flag = 0,表示balance等于withdraw;flag = 1,表示balance大于withdraw; flag = member.getBalance().compareTo(withdraw); if(flag == -1) { - return CommonResult.validateFailed("积分不足,不能提现"); + return CommonResult.validateFailed("余额不足,不能提现"); } member.setBalance(member.getBalance().subtract(withdraw)); //修改余额值 member.setFreeze(member.getFreeze().add(withdraw)); //修改冻结值