From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持
---
fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java
index 3cfa759..e3f3981 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java
@@ -10,7 +10,9 @@
import com.yeshi.fanli.entity.bus.user.cloud.CloudOrderMenuEnum;
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudGroupService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudManageService;
import com.yeshi.fanli.service.inter.user.cloud.UserCloudOrderService;
@@ -26,6 +28,9 @@
@Component
public class UserCloudAlipayManager {
+ @Resource
+ private ConfigService configService;
+
@Resource
private UserCloudService userCloudService;
@@ -57,10 +62,7 @@
throw new UserCloudException(1, "濂楅绫诲瀷涓嶅尮閰�");
// 璁㈠崟淇℃伅
- UserCloudOrder cloudOrder = userCloudOrderService.getLastOrderByUnpaid(uid, type);
- if (cloudOrder == null)
- cloudOrder = userCloudOrderService.addCloudOrder(uid, type);
-
+ UserCloudOrder cloudOrder = userCloudOrderService.addCloudOrder(uid, type);
if (cloudOrder == null || cloudOrder.getId() == null)
throw new UserCloudException(1, "鍒涘缓璁㈠崟淇℃伅澶辫触");
@@ -75,13 +77,13 @@
map.put("subject", "浜戝彂鍗曞厖鍊�");
// 閿�鍞骇鍝佺爜锛屽晢瀹跺拰鏀粯瀹濈绾︾殑浜у搧鐮�
map.put("product_code", type);
- // 璇ョ瑪璁㈠崟鍏佽鐨勬渶鏅氫粯娆炬椂闂达紝閫炬湡灏嗗叧闂氦鏄� 15鍒嗛挓
- map.put("timeout_express", "15m");
+ // 璇ョ瑪璁㈠崟鍏佽鐨勬渶鏅氫粯娆炬椂闂达紝閫炬湡灏嗗叧闂氦鏄� 30鍒嗛挓
+ map.put("timeout_express", "30m");
// 鏀粯鎴愬姛鍚庤繑鍥炲摢涓墠绔〉闈�
- String returnUrl = "http://apph5.banliapp.com";
+ String returnUrl = configService.get(ConfigKeyEnum.cloudAlipayReturnLink.getKey());
// 鏀粯鎴愬姛鍚庡洖璋冨湴鍧�
- String notifyUrl = "http://192.168.1.253:8080/fanli/api/v2/user/cloud/payEnd?id=" +cloudOrder.getId();
+ String notifyUrl = configService.get(ConfigKeyEnum.cloudAlipayNotifyLink.getKey()) +"?id=" +cloudOrder.getId();
// 鑾峰彇鏀粯form
return AlipayApi.tradeWapPayRequest(map, returnUrl, notifyUrl);
}
--
Gitblit v1.8.0