From 1733331a5eb48badc89147621d5a067908fa7238 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 15 六月 2020 16:05:13 +0800
Subject: [PATCH] 云发单

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
index df75ec1..330ff7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -35,6 +35,7 @@
 import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.exception.user.cloud.UserCloudException;
 import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
+import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
@@ -720,6 +721,34 @@
 
 	
 	/**
+	 * 鏀粯瀹屾垚
+	 * 
+	 * @param id
+	 * @param out
+	 */
+	@RequestMapping(value = "payEnd")
+	public void payEnd(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+		if (uid == null || id == null) {
+			out.print(JsonUtil.loadFalseResult(1, "鍙傛暟淇℃伅缂哄け"));
+			return;
+		}
+		
+		try {
+			// 妫�娴嬫槸鍚︽敮浠樺畬鎴�
+			userCloudAlipayManager.tradeQueryByOrderId(id);
+			
+			UserCloudOrder cloudOrder = userCloudOrderService.selectByPrimaryKey(id);
+			JSONObject dataObject = new JSONObject();
+			dataObject.put("money", cloudOrder.getMoney());
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject));
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult(1, "鍥炶皟淇℃伅澶辫触"));
+			LogHelper.errorDetailInfo(e);
+		}
+	}
+	
+	
+	/**
 	 * 鍔ㄦ�佷竴閿彂鍗�
 	 * @param callback
 	 * @param acceptData

--
Gitblit v1.8.0