From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
index 2f992c1..86dc683 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.util.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -35,10 +36,12 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.integral.CodePublishRecord;
import com.yeshi.fanli.entity.integral.IntegralExchange;
+import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;
import com.yeshi.fanli.entity.integral.IntegralTask;
import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.integral.IntegralExchangeException;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.log.LogHelper;
@@ -55,9 +58,6 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.vo.integral.DailySignVO;
import com.yeshi.fanli.vo.integral.ExchangeTipVO;
@@ -66,6 +66,7 @@
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import net.sf.json.JSONObject;
+import org.yeshi.utils.TimeUtil;
@Controller
@RequestMapping("api/v2/integral")
@@ -344,7 +345,7 @@
JSONObject data = new JSONObject();
data.put("goldCoin", goldCoin);
out.print(JsonUtil.loadTrueResult(data));
- } catch (IntegralTaskRecordException e) {
+ } catch (IntegralTaskRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
}
@@ -377,8 +378,22 @@
List<IntegralExchange> list = integralExchangeRecordService.listExchange((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE, uid);
- if (list == null)
- list = new ArrayList<IntegralExchange>();
+
+ List<IntegralExchange> listNew = new ArrayList<>();
+ if (list != null)
+ listNew.addAll(list);
+
+ if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
+ for (int i=0; i < listNew.size(); i ++) {
+ IntegralExchange integralExchange = listNew.get(i);
+ ExchangeTypeEnum type = integralExchange.getType();
+ if (type != null &&
+ (type == ExchangeTypeEnum.inviteCodeActivate || type == ExchangeTypeEnum.inviteCodePublish)) {
+ listNew.remove(i);
+ i--;
+ }
+ }
+ }
// Long count = integralExchangeService.countValid();
@@ -387,9 +402,31 @@
JSONObject data = new JSONObject();
data.put("goldCoin", extraVO.getGoldCoin() + "鏋�");
- data.put("count", list.size());
- data.put("list", gson.toJson(list));
+ data.put("count", listNew.size());
+ data.put("list", gson.toJson(listNew));
out.print(JsonUtil.loadTrueResult(data));
+ }
+
+ @RequestMapping(value = "getExchangeDetail")
+ public void getExchangeDetail(AcceptData acceptData, Long id, String callback, PrintWriter out) {
+ if (id == null || id <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "鍏戞崲ID鏈夎"));
+ return;
+ }
+ IntegralExchange exchange = integralExchangeService.selectByPrimaryKey(id);
+ if (exchange != null) {
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ Gson gson = gsonBuilder.create();
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(gson.toJson(exchange)));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(exchange))));
+ } else {
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadFalseResult("鏈壘鍒�"));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈壘鍒�")));
+ }
}
/**
@@ -400,8 +437,8 @@
* @param id
* @param out
*/
- @RequestMapping(value = "verifyExchange", method = RequestMethod.POST)
- public void verifyExchange(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+ @RequestMapping(value = "verifyExchange")
+ public void verifyExchange(AcceptData acceptData, Long uid, Long id, String callback, PrintWriter out) {
try {
ExchangeTipVO exchange = integralExchangeService.verifyExchange(uid, id);
@@ -409,9 +446,17 @@
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
- out.print(JsonUtil.loadTrueResult(data));
+ if (StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadTrueResult(data));
+ } else {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ }
} catch (IntegralExchangeException e) {
- out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ if (StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ } else {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, e.getMsg())));
+ }
}
}
@@ -424,8 +469,8 @@
* @param out
*/
@RequestSerializableByKey(key = "'integralexchange-'+#uid")
- @RequestMapping(value = "exchange", method = RequestMethod.POST)
- public void exchange(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+ @RequestMapping(value = "exchange")
+ public void exchange(AcceptData acceptData, Long uid, Long id, String callback, PrintWriter out) {
try {
IntegralExchange exchange = integralExchangeService.exchange(uid, id);
@@ -437,9 +482,15 @@
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
data.put("goldCoin", extraVO.getGoldCoin() + "鏋�");
- out.print(JsonUtil.loadTrueResult(data));
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(data));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
} catch (IntegralExchangeException e) {
- out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, e.getMsg())));
}
}
@@ -504,7 +555,7 @@
}
try {
- List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,
+ List<CodePublishRecord> list = codePublishRecordService.listValid(null, (page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE);
if (list == null) {
list = new ArrayList<CodePublishRecord>();
@@ -515,7 +566,7 @@
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", getGson().toJson(list));
- data.put("helpLink", configService.get("publish_list_help_link"));
+ data.put("helpLink", configService.getValue(ConfigKeyEnum.publishListHelpLink.getKey(), SystemInfoUtil.getSystem(acceptData)));
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇澶辫触"));
--
Gitblit v1.8.0