fix payOrder

Helius

2021-09-25 5edab20ea1979055a4d46a738f9762ad573bcf59

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

@@ -35,9 +35,7 @@

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.*;

/**
 * @author wzy
@@ -154,7 +152,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public String payOrder(PayOrderDto payOrderDto) {
    public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
        MallMember member = LoginUserUtil.getLoginUser();
        MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
@@ -168,16 +166,19 @@
        String orderNo = "";
        switch (payOrderDto.getType()) {
            case "1":
                // TODO 微信支付
                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
                orderInfo.setPayImage(payOrderDto.getPayImage());
                orderInfo.setPayMethod("微信支付");
                break;
            case "2":
                // TODO 支付宝支付
                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
                orderInfo.setPayImage(payOrderDto.getPayImage());
                orderInfo.setPayMethod("支付宝支付");
                break;
            case "3":
                orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());

                orderInfo.setPayOrderNo(orderInfo.getOrderNo());
                orderInfo.setPayMethod("积分支付");
            default:

@@ -185,12 +186,15 @@

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

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

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

    private String balancePay(MallOrderInfo orderInfo, String tradePwd) {