diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index 605f1077..61c4c41b 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -311,12 +311,6 @@ public class BuyOrderController { } // 2. 微信支付,需要预支付 if (Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())) { - rabbitTemplate.convertAndSend( - DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE, - DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY, - buyOrder.getOrderId(), - messagePostProcessor() - ); WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); paymentInfo.setOrderSn(orderSn); paymentInfo.setBuyOrderId(buyOrder.getOrderId()); @@ -324,6 +318,12 @@ public class BuyOrderController { paymentInfo.setAppName(buyOrder.getAppName()); wxpayService.prepay(paymentInfo); } + rabbitTemplate.convertAndSend( + DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE, + DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY, + buyOrder.getOrderId(), + messagePostProcessor() + ); Map result = new HashMap<>(); result.put("orderSn", buyOrder.getOrderSn()); result.put("money", totalPrice); @@ -542,17 +542,21 @@ public class BuyOrderController { @RequestMapping("/rechargeSave") @Transactional public R rechargeSave(@RequestBody BuyOrder buyOrder) throws IOException { + buyOrder.setOrderStatus("0"); + buyOrder.setOrderType("point"); String timeId = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(timeId); buyOrderService.save(buyOrder); //下单微信支付预付款订单 - BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper().eq(BuyOrder::getOrderSn, timeId)); - WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); - paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); - paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); - paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); - paymentInfo.setAppName(buyOrder.getAppName()); - wxpayService.prepay(paymentInfo); + if(Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())){ + BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper().eq(BuyOrder::getOrderSn, timeId)); + WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); + paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); + paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); + paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); + paymentInfo.setAppName(buyOrder.getAppName()); + wxpayService.prepay(paymentInfo); + } rabbitTemplate.convertAndSend( DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE, DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY,