From 89e89fe2b2a1578a94b2e2c8ee81efbfbbf85f08 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 14:18:42 +0800
Subject: [PATCH] 兑换邀请码调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 40 ++++++++++++++++++++++------------------
1 files changed, 22 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 a0301d4..6ca35a2 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
@@ -137,7 +137,6 @@
// 鐢ㄦ埛绛惧埌
Integer signState = 0;
- int signDays = 1;
if (page == 1) {
// 绛惧埌
@@ -167,9 +166,6 @@
// 绛惧埌鏃ユ湡淇℃伅
DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId());
- if (dailySignVO != null) {
- signDays = dailySignVO.getDays();
- }
boolean ejectSign = false;
if (signState == 1)
@@ -469,8 +465,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()));
}
@@ -489,20 +488,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