From c9fdff7d45ae118eac10397d8f34661e9f2e968a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 一月 2022 10:28:18 +0800
Subject: [PATCH] 礼金bug修复
---
service-vip/src/main/java/com/ks/vip/util/PayUtil.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/service-vip/src/main/java/com/ks/vip/util/PayUtil.java b/service-vip/src/main/java/com/ks/vip/util/PayUtil.java
index 121bf49..f1c990c 100644
--- a/service-vip/src/main/java/com/ks/vip/util/PayUtil.java
+++ b/service-vip/src/main/java/com/ks/vip/util/PayUtil.java
@@ -1,6 +1,10 @@
package com.ks.vip.util;
+import com.alipay.api.AlipayApiException;
+import com.google.gson.Gson;
import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.yeshi.utils.alipay.AlipayH5PayUtil;
import org.yeshi.utils.entity.alipay.AlipayAppInfo;
import org.yeshi.utils.entity.wx.WXAPPInfo;
@@ -12,6 +16,8 @@
import java.util.Properties;
public class PayUtil {
+
+ final static Logger logger = LoggerFactory.getLogger(PayUtil.class);
public static AlipayAppInfo getAlipayApp() {
@@ -58,6 +64,7 @@
String mchSerialNo = properties.getProperty("mch_serial_no");
String apiV3Key = properties.getProperty("api_v3_key");
+
WXAPPInfo app = new WXAPPInfo(appId, mchId, mchSerialNo, privateKey, apiV3Key);
return app;
@@ -70,14 +77,8 @@
* @param money
* @return
*/
- public static String getVipChargeAlipayForm(String id, OrderType orderType, String orderNo, BigDecimal money) {
+ public static String getVipChargeAlipayForm(String goodsTitle, String orderNo, BigDecimal money, String notifyUrl, String returnUrl) {
try {
- String goodsTitle = "褰辫澶у叏浼氬憳鍏呭��";
- 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;
@@ -85,11 +86,6 @@
e.printStackTrace();
}
return null;
- }
-
-
- public static String getPaySuccessUrl(String id) {
- return "http://vip.ysdq.yeshitv.com/pay_success.html?id=" + id;
}
@@ -103,15 +99,16 @@
* @return
* @throws Exception
*/
- public static String createWXOrder(String id, String ip, String orderNo, BigDecimal money, String title) throws Exception {
+ public static String createWXOrder(String ip, String orderNo, BigDecimal money, String title, String notifyUrl, String returnUrl) throws Exception {
WXPlaceOrderParams params = new WXPlaceOrderParams();
params.setIp(ip);
params.setOrderNo(orderNo);
- params.setNotifyUrl(Constant.HOST + "/BuWan/wx/pay/vip");
+ params.setNotifyUrl(notifyUrl);
params.setFee(money);
params.setBody(title);
params.setApp(getWXAPP());
- String returnUrl = "http://vip.ysdq.yeshitv.com/pay_finish.html?id=" + id;
+
+ logger.info("寰俊鏀粯琛ㄥ崟鏁版嵁锛歿}", new Gson().toJson(params));
String payUrl = WXPayV3Util.createH5Order(params, returnUrl);
return payUrl;
}
--
Gitblit v1.8.0