fix alipay callback

Helius

2021-09-27 d8fb82111f08f7f3be1d9cff9e7a11dfc120ad77

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

@@ -20,6 +20,7 @@
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
@@ -61,6 +62,7 @@
    private final RedisUtils redisUtils;

    private final AgentProducer agentProducer;
    private final IPayService payService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -129,9 +131,6 @@
        orderInfo.setAmount(total);
        this.baseMapper.updateById(orderInfo);

        String redisKey = StrUtil.format(AppContants.REDIS_ORDER_OVERTIME, member.getId(), orderInfo.getId());
        redisUtils.set(redisKey, orderInfo.getId(), 900);

        agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
        return orderInfo.getId();
    }
@@ -167,37 +166,47 @@
            throw new FebsException("订单状态不能支付");
        }

        String orderNo = "";
        String payResultStr = "";
        switch (payOrderDto.getType()) {
            case "1":
                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
                orderInfo.setPayImage(payOrderDto.getPayImage());
//                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
//                orderInfo.setPayImage(payOrderDto.getPayImage());
                orderInfo.setPayMethod("微信支付");
                break;
            case "2":
                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
                orderInfo.setPayImage(payOrderDto.getPayImage());
                if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
                    payResultStr = orderInfo.getPayOrderNo();
                } else {
                    payResultStr = payService.aliPay(orderInfo);
                }

                orderInfo.setPayOrderNo(payResultStr);
                orderInfo.setPayMethod("支付宝支付");

                break;
            case "3":
                orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());
                payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd());

                orderInfo.setPayOrderNo(orderInfo.getOrderNo());
                orderInfo.setPayMethod("积分支付");
                orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                orderInfo.setPayTime(new Date());
                orderInfo.setPayResult("1");

                memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
            default:

        }

        orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
        orderInfo.setPayTime(new Date());
        orderInfo.setPayResult("1");
        this.baseMapper.updateById(orderInfo);

        memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);

        Map<String, Object> map = new HashMap<>();
        map.put("orderNo", orderNo);
        map.put("orderInfo", payResultStr);
        map.put("orderNo", orderInfo.getOrderNo());
        map.put("orderId", orderInfo.getId());

//        agentProducer.sendAutoLevelUpMsg(member.getId());
//        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
        return map;
    }