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, 8 insertions(+), 10 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 696b18e..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;
 
@@ -73,19 +78,12 @@
 		// 閿�鍞骇鍝佺爜锛屽晢瀹跺拰鏀粯瀹濈绾︾殑浜у搧鐮�
 		map.put("product_code", type);
 		// 璇ョ瑪璁㈠崟鍏佽鐨勬渶鏅氫粯娆炬椂闂达紝閫炬湡灏嗗叧闂氦鏄�  30鍒嗛挓
-		map.put("timeout_express", "90m");
-		
-		
-//		map.put("goods_id", cloudOrder.getId() +"");
-//		map.put("goods_name", "浜戝彂鍗�");
-//		map.put("quantity", 1 +"");
-//		map.put("price", menuEnum.getMoney() + "");
-//		
+		map.put("timeout_express", "30m");
 		
 		// 鏀粯鎴愬姛鍚庤繑鍥炲摢涓墠绔〉闈�
-		String returnUrl = "http://192.168.1.114:8848/flqFront/AppInside/cloudPushOrder/cloudPushOrderManage.html";
+		String returnUrl = configService.get(ConfigKeyEnum.cloudAlipayReturnLink.getKey());
 		// 鏀粯鎴愬姛鍚庡洖璋冨湴鍧�
-		String notifyUrl = "http://192.168.1.200:8008/fanli/client/v1/cloud/callback/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