From 2b8f76b2b39ec7e69d9a59133346776c2297e808 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 九月 2024 16:47:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
index 369b371..c9dd934 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
@@ -88,6 +88,7 @@
TVipOrder shopOrder = new TVipOrder();
shopOrder.setCode(OrderCodeUtil.getOrderCode("HY"));
+ shopOrder.setType(1);
shopOrder.setAppUserId(userId);
shopOrder.setType(1);
shopOrder.setVipId(byId.getId());
@@ -109,7 +110,7 @@
paymentOrder.setAmount(shopOrder.getPaymentAmount());
paymentOrder.setOpenId(user.getWxOpenid());
paymentOrder.setDescription("购买会员");
- return wxPaymentClient.orderPay(paymentOrder);
+ return wxPaymentClient.orderPay(paymentOrder).getData();
}else {
AliPaymentReq req = new AliPaymentReq();
req.setOutTradeNo(shopOrder.getCode());
--
Gitblit v1.7.1