From 554d3857358b0ea53c4f65d8d9baad113ef1deb4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 五月 2020 13:53:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
index fa739ef..5afc853 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java
@@ -24,8 +24,11 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.PreviewInfo;
+import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.TeamEincomeRecord;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
@@ -39,6 +42,7 @@
import com.yeshi.fanli.service.inter.money.extract.ExtractService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
+import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -90,6 +94,10 @@
@Resource
private TeamEincomeRecordService teamEincomeRecordService;
+
+ @Resource
+ private PreviewInfoService previewInfoService;
+
private Gson getGson() {
GsonBuilder builder = new GsonBuilder();
@@ -121,6 +129,29 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ // VIP鏁版嵁棰勮
+ MoneyStatisticVO vo = null;
+ String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.moneyInfo);
+ if (!StringUtil.isNullOrEmpty(redisContent)) {
+ vo = new Gson().fromJson(redisContent, MoneyStatisticVO.class);
+ if (vo != null) {
+ vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));
+ vo.setExtractDesc("鎻愮幇閲戦灏辨槸宸叉垚鍔熸彁鐜板埌鏀粯瀹濈殑璧勯噾");
+ vo.setMoneyArrivalDesc("璁㈠崟宸插埌璐﹀悗鎻愮幇鏃堕棿鍜岄噾棰濆潎涓嶅彈闄愬埗");
+ }
+ }
+
+ if (vo == null) {
+ vo = createMoneyStatistic(uid);
+ }
+
+ Gson gson = getGson();
+ out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ }
+
+
+ public MoneyStatisticVO createMoneyStatistic(Long uid) {
UserInfo user = userInfoService.getUserById(uid);
MoneyStatisticVO vo = new MoneyStatisticVO();
@@ -234,10 +265,10 @@
.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
calendar.add(Calendar.MONTH, -1);
vo.setMonthPredict(cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate)));
-
- Gson gson = getGson();
- out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ return vo;
}
+
+
@RequestMapping(value = "getUserMoneyInfo")
public void getUserMoneyInfo(AcceptData acceptData, Long uid, PrintWriter out) {
@@ -298,10 +329,22 @@
return;
}
- List<Extract> list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid);
- if (list == null) {
- list = new ArrayList<>();
+ List<Extract> list = null;
+ String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.extractRecord);
+ if (!StringUtil.isNullOrEmpty(redisContent)) {
+ Gson gson = new Gson();
+ list = gson.fromJson(redisContent, new TypeToken<ArrayList<Extract>>() {}.getType());
}
+
+ // 鏌ヨ鐪熷疄
+ long count = 0;
+ if (list == null) {
+ list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid);
+ count = extractService.countExtractSucceedRecord(uid);
+ }
+
+ if (list == null)
+ list = new ArrayList<>();
JSONArray JSONArray = new JSONArray();
for (Extract extract : list) {
@@ -320,7 +363,7 @@
}
JSONObject json = new JSONObject();
- json.put("count", extractService.countExtractSucceedRecord(uid));
+ json.put("count", count == 0 ? list.size() : 0);
json.put("list", JSONArray);
out.print(JsonUtil.loadTrueResult(json));
}
--
Gitblit v1.8.0