From d1b52b439ed42224be098b12d13e323bdaad5846 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 15:08:31 +0800
Subject: [PATCH] 券区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 34 ++++++++++++++++------------------
1 files changed, 16 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 60fbcb8..f7b5af1 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
@@ -11,7 +11,6 @@
import java.util.Set;
import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -109,8 +108,7 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
-
+
/**
* 鑾峰彇浠诲姟鍒楄〃
*
@@ -119,7 +117,7 @@
* @param page
* @param out
*/
-// @RequestSerializableByKey(key="#acceptData.device")
+ // @RequestSerializableByKey(key="#acceptData.device")
@RequestMapping(value = "getTaskList", method = RequestMethod.POST)
public void getTaskList(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
if (uid == null || uid <= 0) {
@@ -187,17 +185,19 @@
}
for (IntegralTaskClassVO taskClassVO : list) {
- UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
+ UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
- UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid);
- if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) {
- JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate",
- Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion()));
-
- taskClassVO.setJumpDetail(jumpDetailV2);
+ // 閭�璇峰ソ鍙嬶細鏄惁婵�娲婚個璇风爜
+ if (uniqueKey == UniqueKeyEnum.inviteTeam) {
+ UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid);
+ if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) {
+ JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate",
+ Constant.getPlatformCode(acceptData.getPlatform()),
+ Integer.parseInt(acceptData.getVersion()));
+ taskClassVO.setJumpDetail(jumpDetailV2);
+ }
}
-
-
+
String progress = taskClassVO.getProgress();
if (StringUtil.isNullOrEmpty(progress))
continue;
@@ -414,7 +414,6 @@
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
out.print(JsonUtil.loadTrueResult(data));
@@ -422,7 +421,6 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
/**
* 鍏戞崲閲戝竵
@@ -438,7 +436,7 @@
IntegralExchange exchange = integralExchangeService.exchange(uid, id);
UserInfoExtra extraVO = userInfoExtraService.getUserInfoExtra(uid);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
@@ -509,7 +507,7 @@
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
+
try {
List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE);
@@ -551,7 +549,7 @@
}
IntegralTaskRecord record = null;
try {
- record = integralGetService.addEventStatistic(uid, event, null);
+ record = integralGetService.addEventStatistic(uid, event);
} catch (IntegralGetException e) {
}
if (record == null) {
--
Gitblit v1.8.0