From 759f8df85ddb840682f91bad31e874fa0b58c075 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 14 四月 2021 19:16:12 +0800
Subject: [PATCH] 订单系统修改

---
 src/main/java/com/yeshi/buwan/util/user/VipUtil.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 19bcbcd..3fb3fd2 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,7 @@
 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;
@@ -73,11 +74,14 @@
      * @param money
      * @return
      */
-    public static String getVipChargeAlipayForm(String id, 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/pay_success.html?id=" + id;
-            String notifyUrl = Constant.HOST+ "/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;
@@ -85,6 +89,11 @@
             e.printStackTrace();
         }
         return null;
+    }
+
+
+    public static String getPaySuccessUrl(String id) {
+        return "http://vip.ysdq.yeshitv.com/pay_success.html?id=" + id;
     }
 
 
@@ -102,7 +111,7 @@
         WXPlaceOrderParams params = new WXPlaceOrderParams();
         params.setIp(ip);
         params.setOrderNo(orderNo);
-        params.setNotifyUrl( Constant.HOST+ "/BuWan/wx/pay/vip");
+        params.setNotifyUrl(Constant.HOST + "/BuWan/wx/pay/vip");
         params.setFee(money);
         params.setBody(title);
         params.setApp(getWXAPP());

--
Gitblit v1.8.0