zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
wangjinlei
2024-05-24 13:16:33 +08:00
parent 3992f13fdf
commit 1d09fbb0b3
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -311,12 +311,6 @@ public class BuyOrderController {
} }
// 2. 微信支付，需要预支付 // 2. 微信支付，需要预支付
if (Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())) { 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(); WechatPaymentInfo paymentInfo = new WechatPaymentInfo();
paymentInfo.setOrderSn(orderSn); paymentInfo.setOrderSn(orderSn);
paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setBuyOrderId(buyOrder.getOrderId());
@@ -324,6 +318,12 @@ public class BuyOrderController {
paymentInfo.setAppName(buyOrder.getAppName()); paymentInfo.setAppName(buyOrder.getAppName());
wxpayService.prepay(paymentInfo); wxpayService.prepay(paymentInfo);
} }
rabbitTemplate.convertAndSend(
DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE,
DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY,
buyOrder.getOrderId(),
messagePostProcessor()
);
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("orderSn", buyOrder.getOrderSn()); result.put("orderSn", buyOrder.getOrderSn());
result.put("money", totalPrice); result.put("money", totalPrice);
@@ -542,17 +542,21 @@ public class BuyOrderController {
@RequestMapping("/rechargeSave") @RequestMapping("/rechargeSave")
@Transactional @Transactional
public R rechargeSave(@RequestBody BuyOrder buyOrder) throws IOException { public R rechargeSave(@RequestBody BuyOrder buyOrder) throws IOException {
buyOrder.setOrderStatus("0");
buyOrder.setOrderType("point");
String timeId = IdWorker.getTimeId().substring(0, 32); String timeId = IdWorker.getTimeId().substring(0, 32);
buyOrder.setOrderSn(timeId); buyOrder.setOrderSn(timeId);
buyOrderService.save(buyOrder); buyOrderService.save(buyOrder);
//下单微信支付预付款订单 //下单微信支付预付款订单
BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper<BuyOrder>().eq(BuyOrder::getOrderSn, timeId)); if(Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())){
WechatPaymentInfo paymentInfo = new WechatPaymentInfo(); BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper<BuyOrder>().eq(BuyOrder::getOrderSn, timeId));
paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); WechatPaymentInfo paymentInfo = new WechatPaymentInfo();
paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); paymentInfo.setOrderSn(buyOrderEntity.getOrderSn());
paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId()));
paymentInfo.setAppName(buyOrder.getAppName()); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney());
wxpayService.prepay(paymentInfo); paymentInfo.setAppName(buyOrder.getAppName());
wxpayService.prepay(paymentInfo);
}
rabbitTemplate.convertAndSend( rabbitTemplate.convertAndSend(
DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE, DelayQueueConfig.ORDER_TO_BE_PAY_EXCHANGE,
DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY, DelayQueueConfig.ORDER_TO_BE_PAY_ROUTING_KEY,