购买民宿卷商品，支付完，订单就已经完成

xiaoyong931011

2023-07-20 862288470a25d1f18828c2161e7cad72a399a99e

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

@@ -145,35 +145,8 @@
            if(1 != goodsResult){
                throw new FebsException(mallGoods.getGoodsName() + "库存不足");
            }
            BigDecimal amount = BigDecimal.ZERO;
            BigDecimal itemPrice = BigDecimal.ZERO;
            /**
             *
             */
            Integer isNormal = mallGoods.getIsNormal();
            if(GoodsTypeEnum.SCORE_CHANGE.getValue() == isNormal){
                //普通用户使用原价购买
                amount = sku.getOriginalPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                itemPrice = sku.getOriginalPrice();
            }else if(GoodsTypeEnum.BUY_SCORE.getValue() == isNormal){
                //普通用户使用原价购买
                amount = sku.getLevelOnePrice().multiply(BigDecimal.valueOf(item.getCnt()));
                itemPrice = sku.getLevelOnePrice();
            }else if(GoodsTypeEnum.NORMAL_GOODS.getValue() == isNormal){
                //普通用户使用原价购买
                amount = sku.getLevelTwoPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                itemPrice = sku.getLevelTwoPrice();
            }else if(GoodsTypeEnum.CLASS_ROLL.getValue() == isNormal){
                //普通用户使用原价购买
                amount = sku.getLevelThreePrice().multiply(BigDecimal.valueOf(item.getCnt()));
                itemPrice = sku.getLevelThreePrice();
            }else if(GoodsTypeEnum.HOUSE_ROLL.getValue() == isNormal){
                //普通用户使用原价购买
                amount = sku.getLevelThreePrice().multiply(BigDecimal.valueOf(item.getCnt()));
                itemPrice = sku.getLevelThreePrice();
            }else{
                throw new FebsException("当前商品无法购买！");
            }
            BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
            BigDecimal itemPrice = sku.getPresentPrice();
            orderItem.setAmount(amount);
            orderItem.setCnt(item.getCnt());
            orderItem.setOrderId(orderInfo.getId());
@@ -322,7 +295,7 @@

        String payResultStr = "";
        String wxResultStr = "";
        String amountActualMsg = "";
        String amountActualMsg = "0";
        switch (payOrderDto.getType()) {
            case "1":
                BrandWCPayRequestData brandWCPayRequestData = null;
@@ -399,8 +372,8 @@
                if(amountActual.compareTo(BigDecimal.ZERO) > 0){
                    mallMoneyFlowService.addMoneyFlow(member.getId(), amountActual.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                            orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                    amountActualMsg = amountActual.toString();
                }
                amountActualMsg = amountActual.toString();
                if(scoreActual.compareTo(BigDecimal.ZERO) > 0){
                    mallMoneyFlowService.addMoneyFlow(member.getId(), scoreActual.negate(),
                            MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
@@ -415,12 +388,13 @@
                if(stateRoll == 2){
                    throw new FebsException("兑换券已使用");
                }

                mallRollPerk.setState(2);
                mallRollPerkMapper.updateById(mallRollPerk);
                payResultStr = orderInfo.getOrderNo();

                orderInfo.setPayOrderNo(payOrderDto.getRollId().toString());
                orderInfo.setPayMethod("兑换券支付");
                orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
                orderInfo.setPayTime(new Date());
                orderInfo.setPayResult("1");