blame | history | patch | commit | commitdiff | ignore whitespace
xiaoyong931011
2022-05-27 5742f9cdb399cc75dd1ef27d74cac92e514d8268 
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java


@@ -203,6 +203,7 @@


//                orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());


//                orderInfo.setPayImage(payOrderDto.getPayImage());


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


                agentProducer.sendOrderReturn(orderInfo.getId());


                break;


            case "2":


                if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {


@@ -213,6 +214,7 @@




                orderInfo.setPayOrderNo(payResultStr);


                orderInfo.setPayMethod("支付宝支付");


                agentProducer.sendOrderReturn(orderInfo.getId());


                break;


            case "3":


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


@@ -247,7 +249,7 @@




                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());


//                agentProducer.sendAutoLevelUpMsg(member.getId());


//                agentProducer.sendReturnMoneyMsg(orderInfo.getId());


                agentProducer.sendOrderReturn(orderInfo.getId());


                break;


            case "4":


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


@@ -260,7 +262,6 @@


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


                orderInfo.setPayTime(new Date());


                orderInfo.setPayResult("1");






                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());


                break;