From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/util/user/VipUtil.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/user/VipUtil.java b/src/main/java/com/yeshi/buwan/util/user/VipUtil.java
index 0c63da9..f1142e7 100644
--- a/src/main/java/com/yeshi/buwan/util/user/VipUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/user/VipUtil.java
@@ -1,6 +1,8 @@
package com.yeshi.buwan.util.user;
import com.alipay.api.AlipayApiException;
+import com.yeshi.buwan.domain.vip.OrderType;
+import com.yeshi.buwan.util.Constant;
import org.apache.commons.io.IOUtils;
import org.yeshi.utils.alipay.AlipayH5PayUtil;
import org.yeshi.utils.entity.alipay.AlipayAppInfo;
@@ -8,7 +10,6 @@
import org.yeshi.utils.entity.wx.WXPlaceOrderParams;
import org.yeshi.utils.wx.WXPayV3Util;
-import java.io.FileInputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Properties;
@@ -72,11 +73,14 @@
* @param money
* @return
*/
- public static String getVipChargeAlipayForm(String orderNo, BigDecimal money) {
+ public static String getVipChargeAlipayForm(String id, OrderType orderType, String orderNo, BigDecimal money) {
try {
String goodsTitle = "褰辫澶у叏浼氬憳鍏呭��";
- String returnUrl = "http://vip.ysdq.yeshitv.com";
- String notifyUrl = "http://api.ysdq.yeshitv.com:8089/BuWan/alipay/pay";
+ if (orderType == OrderType.video) {
+ goodsTitle = "褰辫澶у叏鍗曠墖璐拱";
+ }
+ String returnUrl = getPaySuccessUrl(id);
+ String notifyUrl = Constant.HOST + "/BuWan/alipay/pay";
AlipayAppInfo appInfo = getAlipayApp();
String form = AlipayH5PayUtil.createOrderForm(appInfo, orderNo, money, goodsTitle, returnUrl, notifyUrl);
return form;
@@ -84,6 +88,11 @@
e.printStackTrace();
}
return null;
+ }
+
+
+ public static String getPaySuccessUrl(String id) {
+ return "http://vip.ysdq.yeshitv.com/pay_success.html?id=" + id;
}
@@ -97,15 +106,16 @@
* @return
* @throws Exception
*/
- public static String createWXOrder(String ip, String orderNo, BigDecimal money, String title) throws Exception {
+ public static String createWXOrder(String id, String ip, String orderNo, BigDecimal money, String title) throws Exception {
WXPlaceOrderParams params = new WXPlaceOrderParams();
params.setIp(ip);
params.setOrderNo(orderNo);
- params.setNotifyUrl("http://api.ysdq.yeshitv.com:8089/BuWan/wx/pay/vip");
+ params.setNotifyUrl(Constant.HOST + "/BuWan/wx/pay/vip");
params.setFee(money);
params.setBody(title);
params.setApp(getWXAPP());
- String payUrl = WXPayV3Util.createH5Order(params, "http://vip.ysdq.yeshitv.com/wx_result.html");
+ String returnUrl = "http://vip.ysdq.yeshitv.com/pay_finish.html?id=" + id;
+ String payUrl = WXPayV3Util.createH5Order(params, returnUrl);
return payUrl;
}
--
Gitblit v1.8.0