From 59ce2452667a57caf547a753913cf5e573c8cc39 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 19 八月 2019 18:05:47 +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 | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 8e91977..9ae2299 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
@@ -183,11 +183,12 @@
*
* @param acceptData
* @param uid
- * @param ids
+ * @param ids // 棰嗗彇id
+ * @param gids // 鏈鍙杋d
* @param out
*/
@RequestMapping(value = "receiveGoldCoin", method = RequestMethod.POST)
- public void receiveGoldCoin(AcceptData acceptData, Long uid, String ids, PrintWriter out) {
+ public void receiveGoldCoin(AcceptData acceptData, Long uid, String ids, String gids, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -200,11 +201,28 @@
out.print(JsonUtil.loadFalseResult("棰嗗彇id涓嶈兘涓虹┖"));
return;
}
+
try {
Integer goldCoin = integralTaskRecordService.receiveGoldCoin(uid, idList);
+
+ Set<Long> gidList = gson.fromJson(gids, new TypeToken<HashSet<Long>>() {}.getType());
+ List<IntegralTaskRecord> list = null;
+ if (gidList != null && gidList.size() > 0) {
+ list = integralTaskRecordService.listNotReceivedExcludeId(5 - gidList.size(), uid, gidList);
+ } else {
+ list = integralTaskRecordService.listNotReceivedExcludeId(5, uid, null);
+ }
+
+ if (list == null) {
+ list = new ArrayList<IntegralTaskRecord>();
+ }
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ Gson gson2 = gsonBuilder.create();
+
JSONObject data = new JSONObject();
data.put("goldCoin", goldCoin);
+ data.put("list", gson2.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
} catch (IntegralTaskRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
@@ -401,15 +419,15 @@
case "recommendSearch":
notify.put("name", "瀹屾垚涓�娆℃櫤鑳芥悳绱�");
- notify.put("score", "+20");
+ notify.put("score", "+20閲戝竵");
break;
case "scanGoods":
notify.put("name", "瀹屾垚涓�娆″晢鍝佹祻瑙�");
- notify.put("score", "+10");
+ notify.put("score", "+100閲戝竵");
break;
case "scanTBCart":
notify.put("name", "瀹屾垚涓�娆¤喘鐗╄溅娴忚");
- notify.put("score", "+30");
+ notify.put("score", "+300閲戝竵");
break;
}
--
Gitblit v1.8.0