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/PreviewInfoControllerV2.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
index c43dd4b..4c176a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java
@@ -44,6 +44,10 @@
@Resource
private RedisManager redisManager;
+
+ @Resource
+ private UserMoneyControllerV2 userMoneyControllerV2;
+
/**
* 淇濆瓨璧勯噾淇℃伅
@@ -71,12 +75,13 @@
@RequestMapping(value = "getMoneyInfo")
public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ MoneyStatisticVO dto = null;
PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);
- if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
+ if (previewInfo != null && !StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ dto = new Gson().fromJson(previewInfo.getContent(), MoneyStatisticVO.class);
+ } else {
+ dto = userMoneyControllerV2.createMoneyStatistic(uid);
}
- MoneyStatisticVO dto = new Gson().fromJson(previewInfo.getContent(), MoneyStatisticVO.class);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
}
@@ -169,14 +174,13 @@
* @param out
*/
@RequestMapping(value = "saveMineInfo")
- public void saveMineInfo(String callback, AcceptData acceptData, MineInfoVO infoVO, MultipartFile file,
- PrintWriter out) {
+ public void saveMineInfo(String callback, AcceptData acceptData, MineInfoVO infoVO, PrintWriter out) {
if (infoVO == null || infoVO.getUid() == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
try {
- previewInfoService.saveMineInfo(infoVO, file);
+ previewInfoService.saveMineInfo(infoVO);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0