From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 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 cb379fe..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
@@ -26,10 +26,12 @@
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;
import com.yeshi.fanli.exception.user.vip.GiveVIPApplyInfoException;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
import com.yeshi.fanli.service.inter.user.vip.GiveVIPApplyInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
@@ -57,8 +59,19 @@
@Resource
private UserVipConfigService userVipConfigService;
+ @Resource
+ private ThreeSaleDetailService threeSaleDetailService;
+
@RequestMapping(value = "applyVip")
public void applyVip(AcceptData acceptData, GiveVIPApplyInfo info, String callback, PrintWriter out) {
+ // 鏌ヨ寮�閫氫汉鏄惁涓轰粬鐨勪笅绾�
+ ThreeSaleDetail detail = threeSaleDetailService.getByBossUidAndWorkerUid(info.getSourceUid(),
+ info.getTargetUid());
+ if (detail == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉鏄偍鐨勭矇涓�"));
+ return;
+ }
+
try {
info = giveVIPApplyInfoService.addGiveVIPApplyInfo(info);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鐢宠鎴愬姛"));
@@ -67,6 +80,31 @@
} catch (GiveVIPApplyInfoException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
}
+ }
+
+ @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)));
+
}
// 鎻愪氦鐢宠淇℃伅
@@ -119,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("璧勬枡鎻愪氦鎴愬姛"));
}
@@ -134,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");
@@ -158,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