fix

Hentua

2024-01-25 1b08257957a0d7027574460711fe58fd8b693a72

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

@@ -23,6 +23,8 @@
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cc.mrbird.febs.vip.service.IMallVipConfigBenefitsService;
import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -87,6 +89,8 @@
    private final MallGoodsCouponMapper mallGoodsCouponMapper;
    private final CouponGoodsMapper couponGoodsMapper;

    private final IMallVipConfigService mallVipConfigService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOrder(AddOrderDto addOrderDto) {
@@ -145,6 +149,9 @@
                    orderItem.setSkuImage(mallGoods.getThumb());
                    orderItem.setState(1);

                    if (addOrderDto.getType() == 1) {
                        mallShoppingCartMapper.delBySkuId(mallGoods.getId(), member.getId());
                    }
                    total = total.add(amount);
                } else {
                    MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
@@ -314,7 +321,12 @@
        orderInfo.setCancelType(MallOrderInfo.CANCEL_BY_SELF);
        this.baseMapper.updateById(orderInfo);

        if (orderInfo.getOrderType() == 2) {

            mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
            memberWalletService.add(orderInfo.getAmount(), member.getId(), "prizeScore");
            return;
        }

        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
        if(CollUtil.isNotEmpty(mallOrderItemList)){
@@ -438,6 +450,7 @@
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);

                agentProducer.sendOrderCoupon(orderInfo.getId());
                agentProducer.sendGetScoreMsg(orderInfo.getId());
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {