From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 2508cbf..80e4ce2 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
@@ -108,8 +108,7 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
-
+
/**
* 鑾峰彇浠诲姟鍒楄〃
*
@@ -118,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) {
@@ -186,17 +185,17 @@
}
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()));
-
+ Constant.getPlatformCode(acceptData.getPlatform()),
+ Integer.parseInt(acceptData.getVersion()));
+
taskClassVO.setJumpDetail(jumpDetailV2);
}
-
-
+
String progress = taskClassVO.getProgress();
if (StringUtil.isNullOrEmpty(progress))
continue;
@@ -420,7 +419,6 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
/**
* 鍏戞崲閲戝竵
@@ -436,7 +434,7 @@
IntegralExchange exchange = integralExchangeService.exchange(uid, id);
UserInfoExtra extraVO = userInfoExtraService.getUserInfoExtra(uid);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
@@ -507,7 +505,7 @@
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
+
try {
List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE);
@@ -549,7 +547,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