From b7a90c576ac6b482c68ad6d0c2777831f9127b4a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 16:48:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserVipController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 4732f75..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("璧勬枡鎻愪氦鎴愬姛"));
}
@@ -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