From 2a115db799dfec53e891c137020590545648e47f Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Wed, 19 Jun 2024 15:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BuyOrderController.java | 17 +++++++++++++++-- .../common/controller/UserVipController.java | 12 ++++++++---- .../pay/weChatPay/config/WechatPayConfig.java | 2 ++ .../service/impl/WxpayServiceImpl.java | 2 ++ src/main/resources/application-dev.yml | 1 + src/main/resources/application-dev1.yml | 1 + src/main/resources/application-prod.yml | 1 + src/main/resources/application-test.yml | 1 + 8 files changed, 31 insertions(+), 6 deletions(-) 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 c230574b..6733efe7 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -315,7 +315,13 @@ public class BuyOrderController { paymentInfo.setOrderSn(orderSn); paymentInfo.setBuyOrderId(buyOrder.getOrderId()); paymentInfo.setTotalAmount(totalPrice); - paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( @@ -554,7 +560,14 @@ public class BuyOrderController { paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId())); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); - paymentInfo.setAppName(buyOrder.getAppName()); +// paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( diff --git a/src/main/java/com/peanut/modules/common/controller/UserVipController.java b/src/main/java/com/peanut/modules/common/controller/UserVipController.java index 59636f84..e31bb764 100644 --- a/src/main/java/com/peanut/modules/common/controller/UserVipController.java +++ b/src/main/java/com/peanut/modules/common/controller/UserVipController.java @@ -80,9 +80,6 @@ public class UserVipController { String timeId = IdWorker.getTimeId().substring(0, 32); buyOrder.setOrderSn(timeId); buyOrder.setUserId(uid); - if(buyOrder.getCome()==1){ - buyOrder.setAppName("zmzm"); - } buyOrderService.save(buyOrder); BigDecimal totalPrice = buyOrder.getRealMoney(); if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) { @@ -112,7 +109,14 @@ public class UserVipController { paymentInfo.setOrderSn(buyOrderEntity.getOrderSn()); paymentInfo.setBuyOrderId(buyOrderEntity.getOrderId()); paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney()); - paymentInfo.setAppName(buyOrder.getAppName()); +// paymentInfo.setAppName(buyOrder.getAppName()); + if (buyOrder.getCome()==2){ + paymentInfo.setAppName("wumen"); + } else if (buyOrder.getCome()==1) { + paymentInfo.setAppName("zmzm"); + }else { + paymentInfo.setAppName(buyOrder.getAppName()); + } wxpayService.prepay(paymentInfo); } rabbitTemplate.convertAndSend( diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java index 407e3875..dccde641 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java @@ -45,6 +45,8 @@ public class WechatPayConfig implements Serializable { private String appId;//fzds @Value("${wxpay.zmzmappId}") private String zmzmappId; + @Value("${wxpay.wumenappId}") + private String wumenappId; /** * 商户号 */ diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index 8a8bce0c..8ce6f3f0 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -86,6 +86,8 @@ public class WxpayServiceImpl extends ServiceImpl