From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java
index 9f5772d..2c59806 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java
@@ -82,6 +82,31 @@
 		}
 	}
 
+	@RequestMapping(value = "getApplyInfo")
+	public void getApplyInfo(AcceptData acceptData, String id, Long uid, String callback, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(id)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇蜂笂浼爄d"));
+			return;
+		}
+
+		GiveVIPApplyInfo info = giveVIPApplyInfoService.selectByPrimaryKey(id);
+		if (info == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢宠淇℃伅涓嶅瓨鍦�"));
+			return;
+		}
+
+		// 鏌ヨ寮�閫氫汉鏄惁涓轰粬鐨勪笅绾�
+		ThreeSaleDetail detail = threeSaleDetailService.getByBossUidAndWorkerUid(info.getSourceUid(),
+				info.getTargetUid());
+		if (detail == null && info.getTargetUid().longValue() != uid) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉鏄偍鐨勭矇涓�"));
+			return;
+		}
+
+		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(info)));
+
+	}
+
 	// 鎻愪氦鐢宠淇℃伅
 	@RequestMapping(value = "uploadApplyInfo")
 	public void uploadApplyInfo(AcceptData acceptData, GiveVIPApplyInfo info, String callback,
@@ -132,8 +157,9 @@
 			if (imgList.size() > 0)
 				info.setImgList(imgList);
 			info.setState(GiveVIPApplyInfo.STATE_NOT_VERIFY);
-			giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);
+			
 		}
+		giveVIPApplyInfoService.updateGiveVIPApplyInfo(info);
 		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("璧勬枡鎻愪氦鎴愬姛"));
 	}
 
@@ -147,8 +173,8 @@
 		if (Constant.IS_TEST) {
 			page = 1;
 		}
-		List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listByTargetUid(uid, page, Constant.PAGE_SIZE);
-		long count = giveVIPApplyInfoService.countByTargetUid(uid);
+		List<GiveVIPApplyInfo> list = giveVIPApplyInfoService.listBySourceUid(uid, page, Constant.PAGE_SIZE);
+		long count = giveVIPApplyInfoService.countBySourceUid(uid);
 		String uploadInfoLink = userVipConfigService.getValueByKey("apply_vip_upload_info_link");
 		String vipLink = userVipConfigService.getValueByKey("vip_link");
 
@@ -171,9 +197,9 @@
 
 		Gson gson = gb.create();
 
-		if (Constant.IS_TEST) {
-			count = 100;
-		}
+		// if (Constant.IS_TEST) {
+		// count = 100;
+		// }
 
 		JSONObject data = new JSONObject();
 		data.put("list", gson.toJson(recordList));

--
Gitblit v1.8.0