xiaoyong931011
2023-07-21 d5c0d74f06a70a946f9c34c0ea922bf3b9b4dafe
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -145,12 +145,9 @@
            if(1 != goodsResult){
                throw new FebsException(mallGoods.getGoodsName() + "库存不足");
            }
            BigDecimal amount = BigDecimal.ZERO;
            BigDecimal itemPrice = BigDecimal.ZERO;
            /**
             *
             */
            orderItem.setAmount(sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt())));
            BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
            BigDecimal itemPrice = sku.getPresentPrice();
            orderItem.setAmount(amount);
            orderItem.setCnt(item.getCnt());
            orderItem.setOrderId(orderInfo.getId());
            orderItem.setPrice(itemPrice);
@@ -298,7 +295,7 @@
        String payResultStr = "";
        String wxResultStr = "";
        String amountActualMsg = "";
        String amountActualMsg = "0";
        switch (payOrderDto.getType()) {
            case "1":
                BrandWCPayRequestData brandWCPayRequestData = null;
@@ -375,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);
@@ -391,12 +388,12 @@
                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.setPayTime(new Date());
                orderInfo.setPayResult("1");
@@ -405,6 +402,9 @@
                break;
            default:
        }
        if(ObjectUtil.isNotEmpty(payOrderDto.getUseTime())){
            orderInfo.setUseTime(payOrderDto.getUseTime());
        }
        //订单支付成功产生一个提货码
@@ -416,6 +416,9 @@
        stringBuffer.append("@");
        stringBuffer.append(amountActualMsg);
        agentProducer.sendOrderGetMsg(stringBuffer.toString());
        if("4".equals(payOrderDto.getType())){
            agentProducer.sendRollSendMsg(orderInfo.getId());
        }
//        OrderStateDto orderStateDto = new OrderStateDto();
//        orderStateDto.setOrderNo(orderInfo.getOrderNo());