赠送积分更新状态

xiaoyong931011

2023-07-27 93dd377310eeec4389c6a0f786dd498bdb28cffc

赠送积分更新状态

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

@@ -407,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);

 src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java

@@ -2,6 +2,7 @@

import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
@@ -302,6 +303,17 @@


                        if (order != null && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()) {
                            if(order.getPayMethod().equals("余额加微信")){
                                MallMemberWallet mallMemberWalletThree = mallMemberWalletMapper.selectWalletByMemberId(order.getMemberId());
                                BigDecimal balanceThree = mallMemberWalletThree.getBalance();

                                int reduceThree = memberWalletService.reduce(balanceThree, order.getMemberId(), "balance");
                                if (reduceThree == 2) {
                                    throw new FebsException("余额不足");
                                }
                                mallMoneyFlowService.addMoneyFlow(order.getMemberId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                                        order.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                            }
                            log.debug("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
                            order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                            order.setPayResult("1");