From 8e631ceb2c08e6cd00e68b1aa9ad1fec7cea6a72 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 17:51:32 +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 | 175 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 64 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 5ce6856..8e91977 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
@@ -43,6 +43,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.vo.integral.DailySignVO;
import com.yeshi.fanli.vo.integral.ExchangeTipVO;
import com.yeshi.fanli.vo.integral.IntegralTaskClassVO;
@@ -56,30 +57,31 @@
@Resource
private ConfigService configService;
-
+
@Resource
private UserInfoService userInfoService;
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private IntegralTaskClassService integralTaskClassService;
@Resource
private IntegralTaskRecordService integralTaskRecordService;
-
+
@Resource
private IntegralExchangeService integralExchangeService;
-
+
@Resource
private IntegralExchangeRecordService integralExchangeRecordService;
-
+
@Resource
private CodePublishRecordService codePublishRecordService;
-
+
/**
* 鑾峰彇浠诲姟鍒楄〃
+ *
* @param acceptData
* @param uid
* @param page
@@ -96,17 +98,18 @@
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
try {
JSONObject data = new JSONObject();
- List<IntegralTaskClassVO> list = integralTaskClassService.getIntegralTaskClassVO(uid, (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE);
+ List<IntegralTaskClassVO> list = integralTaskClassService.getIntegralTaskClassVO(uid,
+ (page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE);
if (list == null) {
list = new ArrayList<IntegralTaskClassVO>();
}
long count = integralTaskClassService.countTaskClass();
-
+
if (page == 1) {
UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid);
if (extraVO == null) {
@@ -119,18 +122,18 @@
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ鐢ㄦ埛淇℃伅涓嶅叏"));
return;
}
-
+
UserRank userRank = extraVO.getUserRank();
if (userRank == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛绛夌骇涓嶅瓨鍦�"));
return;
}
-
+
boolean signState = false;
IntegralTaskClass taskClass = integralTaskClassService.getByUniqueKey(UniqueKeyEnum.dailySign.name());
if (taskClass != null)
signState = integralTaskRecordService.isToDaySign(uid, taskClass.getId());
-
+
// 绛惧埌鏃ユ湡
DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId());
data.put("signState", signState);
@@ -139,7 +142,7 @@
data.put("userRank", gson.toJson(userRank));
data.put("dailySign", dailySignVO);
}
-
+
data.put("count", count);
data.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
@@ -147,10 +150,10 @@
LogHelper.errorDetailInfo(e);
}
}
-
-
+
/**
* 鑾峰彇宸插畬鎴愪换鍔� 鏈鍙栭噾甯�
+ *
* @param acceptData
* @param uid
* @param out
@@ -166,18 +169,18 @@
if (list == null) {
list = new ArrayList<IntegralTaskRecord>();
}
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 棰嗗彇閲戝竵
+ *
* @param acceptData
* @param uid
* @param ids
@@ -189,9 +192,10 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
Gson gson = new Gson();
- Set<Long> idList = gson.fromJson(ids, new TypeToken<HashSet<Long>>() {}.getType());
+ Set<Long> idList = gson.fromJson(ids, new TypeToken<HashSet<Long>>() {
+ }.getType());
if (idList == null || idList.size() == 0) {
out.print(JsonUtil.loadFalseResult("棰嗗彇id涓嶈兘涓虹┖"));
return;
@@ -206,10 +210,10 @@
out.print(JsonUtil.loadFalseResult(e.getMsg()));
}
}
-
-
+
/**
- * 閲戝竵鍏戞崲鍒楄〃
+ * 閲戝竵鍏戞崲鍒楄〃
+ *
* @param acceptData
* @param uid
* @param ids
@@ -221,37 +225,38 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
+
UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid);
if (extraVO == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鐩稿叧淇℃伅涓嶅瓨鍦�"));
return;
}
-
+
List<IntegralExchange> list = integralExchangeRecordService.listExchange((page - 1) * Constant.PAGE_SIZE,
Constant.PAGE_SIZE, uid);
- if (list == null)
+ if (list == null)
list = new ArrayList<IntegralExchange>();
-
+
Long count = integralExchangeService.countValid();
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("goldCoin", extraVO.getGoldCoin() + "鏋�");
data.put("count", count);
data.put("list", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
}
-
+
/**
* 鍏戞崲閲戝竵妫�楠�
+ *
* @param acceptData
* @param uid
* @param id
@@ -261,10 +266,10 @@
public void verifyExchange(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
try {
ExchangeTipVO exchange = integralExchangeService.verifyExchange(uid, id);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
out.print(JsonUtil.loadTrueResult(data));
@@ -272,9 +277,10 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
+
/**
* 鍏戞崲閲戝竵
+ *
* @param acceptData
* @param uid
* @param id
@@ -284,10 +290,10 @@
public void exchange(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
try {
IntegralExchange exchange = integralExchangeService.exchange(uid, id);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
out.print(JsonUtil.loadTrueResult(data));
@@ -295,10 +301,10 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
-
+
/**
* 鍏戞崲閲戝竵妫�楠�-閭�璇风爜
+ *
* @param acceptData
* @param uid
* @param id
@@ -308,10 +314,10 @@
public void verifyInviteCode(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
try {
ExchangeTipVO exchange = integralExchangeService.verifyInviteCode(uid, id);
-
+
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
-
+
JSONObject data = new JSONObject();
data.put("result", gson.toJson(exchange));
out.print(JsonUtil.loadTrueResult(data));
@@ -319,10 +325,10 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
-
+
/**
* 鍏戞崲閲戝竵-閭�璇风爜
+ *
* @param acceptData
* @param uid
* @param id
@@ -337,11 +343,10 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
-
-
-
+
/**
* 閭�璇风爜鍙戝竷鍒楄〃
+ *
* @param acceptData
* @param page
* @param out
@@ -352,25 +357,70 @@
out.print(JsonUtil.loadFalseResult(1, "椤电爜涓嶆纭�"));
return;
}
-
- List<CodePublishRecord> list = codePublishRecordService.listValid((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE);
+
+ 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));
}
-
-
+
+ /**
+ * 浜嬩欢鎺ㄩ��
+ *
+ * @param acceptData
+ * @param event
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "pushEvent", method = RequestMethod.POST)
+ public void pushEvent(AcceptData acceptData, String event, Long uid, PrintWriter out) {
+ if (uid == null || uid == 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛灏氭湭鐧诲綍"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(event)) {
+ out.print(JsonUtil.loadFalseResult("浜嬩欢涓虹┖"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ if ("recommendSearch".equalsIgnoreCase(event) || "scanGoods".equalsIgnoreCase(event)
+ || "scanTBCart".equalsIgnoreCase(event)) {
+ JSONObject notify = new JSONObject();
+ switch (event) {
+
+ case "recommendSearch":
+ notify.put("name", "瀹屾垚涓�娆℃櫤鑳芥悳绱�");
+ notify.put("score", "+20");
+ break;
+ case "scanGoods":
+ notify.put("name", "瀹屾垚涓�娆″晢鍝佹祻瑙�");
+ notify.put("score", "+10");
+ break;
+ case "scanTBCart":
+ notify.put("name", "瀹屾垚涓�娆¤喘鐗╄溅娴忚");
+ notify.put("score", "+30");
+ break;
+ }
+
+ data.put("notify", notify);
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
/**
* 鏃堕棿澶勭悊
+ *
* @return
*/
private Gson getGson() {
@@ -382,18 +432,18 @@
String desc = "";
if (value != null) {
// 鍒ゆ柇鏄惁鏄悓涓�澶�
-
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(value);
- int y1 = calendar.get(Calendar.YEAR);//鑾峰彇骞翠唤
- int d1 = calendar.get(Calendar.DAY_OF_YEAR);//鑾峰彇骞翠腑绗嚑澶�
+ int y1 = calendar.get(Calendar.YEAR);// 鑾峰彇骞翠唤
+ int d1 = calendar.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
Date nowDate = new Date();
Calendar calendar2 = Calendar.getInstance();
calendar2.setTime(nowDate);
- int y2 = calendar2.get(Calendar.YEAR);//鑾峰彇骞翠唤
- int d2 = calendar2.get(Calendar.DAY_OF_YEAR);//鑾峰彇骞翠腑绗嚑澶�
-
+ int y2 = calendar2.get(Calendar.YEAR);// 鑾峰彇骞翠唤
+ int d2 = calendar2.get(Calendar.DAY_OF_YEAR);// 鑾峰彇骞翠腑绗嚑澶�
+
long old = value.getTime();
long now = nowDate.getTime();
if (y1 == y2) {
@@ -401,9 +451,9 @@
long cha = now - old;
if (cha < 1000 * 60 * 2L) {
desc = "鍒氬垰";
- }else if (cha < 1000 * 60 * 60L) {
+ } else if (cha < 1000 * 60 * 60L) {
desc = (cha / (1000 * 60)) + "鍒嗛挓鍓�";
- }else {
+ } else {
desc = (cha / (1000 * 60 * 60)) + "灏忔椂鍓�";
}
} else if (d2 - d1 == 1) {
@@ -433,8 +483,5 @@
Gson gson = gb.create();
return gson;
}
-
-
-
-
+
}
--
Gitblit v1.8.0