fix

Helius

2021-09-29 aa02a165eea629fa89d1ff47531ce861cd9fa3bc

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

@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;

import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
@@ -100,7 +101,12 @@
            }

            if (sku.getStock() < item.getCnt()) {
                throw new FebsException("库存不足");
                throw new FebsException(sku.getSkuName() + "库存不足");
            }

            MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
            if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                throw new FebsException(mallGoods.getGoodsName() + "已下架");
            }

            MallOrderItem orderItem = new MallOrderItem();
@@ -174,7 +180,11 @@
                orderInfo.setPayMethod("微信支付");
                break;
            case "2":
                payResultStr = payService.aliPay(orderInfo);
                if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
                    payResultStr = orderInfo.getPayOrderNo();
                } else {
                    payResultStr = payService.aliPay(orderInfo);
                }

                orderInfo.setPayOrderNo(payResultStr);
                orderInfo.setPayMethod("支付宝支付");
@@ -184,24 +194,31 @@

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

                MallMember mallMember = memberMapper.selectById(member.getId());
                if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
                    mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
                    memberMapper.updateById(mallMember);
                }

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

                agentProducer.sendAutoLevelUpMsg(member.getId());
                agentProducer.sendReturnMoneyMsg(orderInfo.getId());
            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("orderInfo", payResultStr);
        map.put("orderNo", orderInfo.getOrderNo());
        map.put("orderId", orderInfo.getId());

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