blame | history | patch | commit | commitdiff | show whitespace
xiaoyong931011
2023-07-20 a1159976975857e0dfb48a45a9a848693bc0d262 
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java


@@ -322,6 +322,7 @@




        String payResultStr = "";


        String wxResultStr = "";


        String amountActualMsg = "";


        switch (payOrderDto.getType()) {


            case "1":


                BrandWCPayRequestData brandWCPayRequestData = null;


@@ -333,6 +334,7 @@


                wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);


                payResultStr = brandWCPayRequestData.getPrepay_id();


                orderInfo.setPayMethod("微信支付");


                amountActualMsg = orderInfo.getAmount().toString();


                break;


            case "2":


                payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");


@@ -346,6 +348,8 @@




                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(),


                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);




                amountActualMsg = orderInfo.getAmount().toString();


                break;


            case "3":


                /**


@@ -396,6 +400,7 @@


                    mallMoneyFlowService.addMoneyFlow(member.getId(), amountActual.negate(), MoneyFlowTypeEnum.PAY.getValue(),


                            orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);


                }


                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);


@@ -413,7 +418,7 @@




                payResultStr = orderInfo.getOrderNo();




                orderInfo.setPayOrderNo(orderInfo.getOrderNo());


                orderInfo.setPayOrderNo(payOrderDto.getRollId().toString());


                orderInfo.setPayMethod("兑换券支付");


                orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());


                orderInfo.setPayTime(new Date());


@@ -430,8 +435,11 @@


        String takeCode = ShareCodeUtil.toSerialCode(orderInfo.getId());


        orderInfo.setTakeCode(takeCode);


        this.baseMapper.updateById(orderInfo);






        StringBuffer stringBuffer = new StringBuffer();


        stringBuffer.append(orderInfo.getId().toString());


        stringBuffer.append("@");


        stringBuffer.append(amountActualMsg);


        agentProducer.sendOrderGetMsg(stringBuffer.toString());




//        OrderStateDto orderStateDto = new OrderStateDto();


//        orderStateDto.setOrderNo(orderInfo.getOrderNo());