赠送积分更新状态

xiaoyong931011

2023-07-28 ea825bb73b6fa9824738914aeb8a657da10e8fe3

 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;
@@ -21,6 +22,7 @@
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
@@ -72,6 +74,8 @@
    private IApiMallMemberService mallMemberService;
    @Autowired
    private MallAgentRecordMapper mallAgentRecordMapper;
    @Autowired
    private AgentProducer agentProducer;

    @Autowired
    private IXcxPayService iXcxPayService;
@@ -299,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");
@@ -308,12 +323,19 @@

                            mallMoneyFlowService.addMoneyFlow(
                                    order.getMemberId(),
                                    order.getAmount().negate(),
                                    payMoney.negate(),
                                    MoneyFlowTypeEnum.WECHAT_PAY.getValue(),
                                    order.getOrderNo(),
                                    FlowTypeEnum.WECHAT.getValue(),
                                    "微信支付",
                                    2);

                            StringBuffer stringBuffer = new StringBuffer();
                            stringBuffer.append(order.getId().toString());
                            stringBuffer.append("@");
                            stringBuffer.append(order.getAmount().toString());
                            agentProducer.sendOrderGetMsg(stringBuffer.toString());

                            threadResult.success().message("支付成功");
                        } else {
                            log.info("订单状态不为待付款，order status=", order.getStatus());