赠送积分更新状态

xiaoyong931011

2023-07-28 c0e5c1f671f928161c28e93d00be40aa2a74ebc0

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -387,6 +387,7 @@
                    throw new FebsException("兑换券已使用");
                }
                mallRollPerk.setState(2);
                mallRollPerk.setUpdateTime(DateUtil.date());
                mallRollPerkMapper.updateById(mallRollPerk);
                payResultStr = orderInfo.getOrderNo();

@@ -406,12 +407,12 @@
                BigDecimal balanceThree = mallMemberWalletThree.getBalance();
                BigDecimal amountThree = orderInfo.getAmount();

                int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
                if (reduceThree == 2) {
                    throw new FebsException("余额不足");
                }
                mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
//                int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
//                if (reduceThree == 2) {
//                    throw new FebsException("余额不足");
//                }
//                mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
//                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);

                //实际支付余额
                BigDecimal amountActualThree = amountThree.subtract(balanceThree).setScale(2, BigDecimal.ROUND_DOWN);