From 1afddff1f453dfe72e75d73917c69305cac0d58d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 18 五月 2020 14:13:30 +0800
Subject: [PATCH] 成长类型调整

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 e176147..4732f75 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
@@ -26,6 +26,7 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.ThreeSaleDetail;
 import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo;
 import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.exception.ParamsException;
@@ -63,7 +64,13 @@
 
 	@RequestMapping(value = "applyVip")
 	public void applyVip(AcceptData acceptData, GiveVIPApplyInfo info, String callback, PrintWriter out) {
-		// TODO 鏌ヨ寮�閫氫汉鏄惁涓轰粬鐨勪笅绾�
+		// 鏌ヨ寮�閫氫汉鏄惁涓轰粬鐨勪笅绾�
+		ThreeSaleDetail detail = threeSaleDetailService.getByBossUidAndWorkerUid(info.getSourceUid(),
+				info.getTargetUid());
+		if (detail == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉鏄偍鐨勭矇涓�"));
+			return;
+		}
 
 		try {
 			info = giveVIPApplyInfoService.addGiveVIPApplyInfo(info);
@@ -140,8 +147,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");
 

--
Gitblit v1.8.0