From 2be98321c477b47f40bb3994b4d7634a2722f335 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 11:16:22 +0800
Subject: [PATCH] 领取金币
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 00cbd7b..2508cbf 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;
@@ -33,6 +32,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
+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.IntegralTask;
@@ -42,6 +42,7 @@
import com.yeshi.fanli.exception.integral.IntegralGetException;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.integral.CodePublishRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralDetailService;
@@ -105,6 +106,10 @@
@Resource
private IntegralGetService integralGetService;
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+
/**
* 鑾峰彇浠诲姟鍒楄〃
*
@@ -181,6 +186,17 @@
}
for (IntegralTaskClassVO taskClassVO : list) {
+ 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);
+ }
+
+
String progress = taskClassVO.getProgress();
if (StringUtil.isNullOrEmpty(progress))
continue;
@@ -189,7 +205,6 @@
if (taskNum == null)
continue;
- UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
if (uniqueKey == UniqueKeyEnum.dailySign) {
if (signState == 0) {
taskClassVO.setLightUp(true); // 绛惧埌澶辫触
@@ -398,7 +413,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));
--
Gitblit v1.8.0