From f6d57d47a19b2c13f78951ad078ca1786b8471fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 10 六月 2020 12:18:52 +0800
Subject: [PATCH] 云发单支付

---
 fanli/src/main/java/com/yeshi/fanli/service/manger/alipay/UserCloudAlipayManager.java |   20 ++++++++++++--------
 1 files changed, 12 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..696b18e 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
@@ -57,10 +57,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 +72,20 @@
 		map.put("subject", "浜戝彂鍗曞厖鍊�");
 		// 閿�鍞骇鍝佺爜锛屽晢瀹跺拰鏀粯瀹濈绾︾殑浜у搧鐮�
 		map.put("product_code", type);
-		// 璇ョ瑪璁㈠崟鍏佽鐨勬渶鏅氫粯娆炬椂闂达紝閫炬湡灏嗗叧闂氦鏄�  15鍒嗛挓
-		map.put("timeout_express", "15m");
+		// 璇ョ瑪璁㈠崟鍏佽鐨勬渶鏅氫粯娆炬椂闂达紝閫炬湡灏嗗叧闂氦鏄�  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() + "");
+//		
 		
 		// 鏀粯鎴愬姛鍚庤繑鍥炲摢涓墠绔〉闈�
-		String returnUrl = "http://apph5.banliapp.com";
+		String returnUrl = "http://192.168.1.114:8848/flqFront/AppInside/cloudPushOrder/cloudPushOrderManage.html";
 		// 鏀粯鎴愬姛鍚庡洖璋冨湴鍧�
-		String notifyUrl = "http://192.168.1.253:8080/fanli/api/v2/user/cloud/payEnd?id=" +cloudOrder.getId();
+		String notifyUrl = "http://192.168.1.200:8008/fanli/client/v1/cloud/callback/payEnd?id=" +cloudOrder.getId();
 		// 鑾峰彇鏀粯form
 		return AlipayApi.tradeWapPayRequest(map, returnUrl, notifyUrl);
 	}

--
Gitblit v1.8.0