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 | 60 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 17 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 40ad264..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;
@@ -31,7 +30,9 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;
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;
@@ -41,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;
@@ -104,6 +106,10 @@
@Resource
private IntegralGetService integralGetService;
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+
/**
* 鑾峰彇浠诲姟鍒楄〃
*
@@ -180,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;
@@ -188,7 +205,6 @@
if (taskNum == null)
continue;
- UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
if (uniqueKey == UniqueKeyEnum.dailySign) {
if (signState == 0) {
taskClassVO.setLightUp(true); // 绛惧埌澶辫触
@@ -397,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));
@@ -420,11 +435,14 @@
try {
IntegralExchange exchange = integralExchangeService.exchange(uid, id);
+ UserInfoExtra extraVO = userInfoExtraService.getUserInfoExtra(uid);
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
+ data.put("goldCoin", extraVO.getGoldCoin() + "鏋�");
out.print(JsonUtil.loadTrueResult(data));
} catch (IntegralExchangeException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
@@ -466,8 +484,11 @@
@RequestMapping(value = "exchangeInviteCode", method = RequestMethod.POST)
public void exchangeInviteCode(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
try {
- integralExchangeService.exchangeInviteCode(uid, id);
- out.print(JsonUtil.loadTrueResult("閭�璇风爜婵�娲绘垚鍔�"));
+ String inviteCode = integralExchangeService.exchangeInviteCode(uid, id);
+ JSONObject data = new JSONObject();
+ data.put("msg", "鍏戞崲鎴愬姛锛岄噾甯佸凡娑堣�� ");
+ data.put("inviteCode", inviteCode);
+ out.print(JsonUtil.loadTrueResult(data));
} catch (IntegralExchangeException e) {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
@@ -486,20 +507,25 @@
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
+
+ try {
+ List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,
+ Constant.PAGE_SIZE);
+ if (list == null) {
+ list = new ArrayList<CodePublishRecord>();
+ }
- List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE,
- Constant.PAGE_SIZE);
- if (list == null) {
- list = new ArrayList<CodePublishRecord>();
+ long count = codePublishRecordService.countValid();
+
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ data.put("list", getGson().toJson(list));
+ data.put("helpLink", configService.get("publish_list_help_link"));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult(1, "鑾峰彇澶辫触"));
+ return;
}
-
- long count = codePublishRecordService.countValid();
-
- JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("list", getGson().toJson(list));
- data.put("helpLink", configService.get("publish_list_help_link"));
- out.print(JsonUtil.loadTrueResult(data));
}
/**
--
Gitblit v1.8.0