From aa9776a39b03e4eab22a42bd40156eabb7ddf75a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 16 五月 2020 15:07:16 +0800
Subject: [PATCH] 添加创建时间
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 184 +++++++++++++++++++++++++--------------------
1 files changed, 103 insertions(+), 81 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 0942dd3..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;
+
/**
* 淇濆瓨璧勯噾淇℃伅
@@ -68,6 +72,20 @@
}
}
+
+ @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())) {
+ dto = new Gson().fromJson(previewInfo.getContent(), MoneyStatisticVO.class);
+ } else {
+ dto = userMoneyControllerV2.createMoneyStatistic(uid);
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
+ }
+
+
/**
* 淇濆瓨鎻愮幇璁板綍
*
@@ -90,80 +108,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- }
-
- /**
- * 鍒犻櫎鎻愮幇璁板綍
- *
- * @param callback
- * @param acceptData
- * @param uid
- * @param vo
- * @param out
- */
- @RequestMapping(value = "deleteExtractRecord")
- public void deleteExtractRecord(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) {
- if (uid == null || id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
- return;
- }
- previewInfoService.deleteExtractRecord(uid, id);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
-
- /**
- * 淇濆瓨鎴戠殑淇℃伅
- *
- * @param callback
- * @param acceptData
- * @param infoVO
- * @param file
- * @param out
- */
- @RequestMapping(value = "saveMineInfo")
- public void saveMineInfo(String callback, AcceptData acceptData, MineInfoVO infoVO, MultipartFile file,
- PrintWriter out) {
- if (infoVO == null || infoVO.getUid() == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
- try {
- previewInfoService.saveMineInfo(infoVO, file);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- }
- }
-
- /**
- * 鍒拌处棰勮-鐢熶骇鍥剧墖
- *
- * @param callback
- * @param acceptData
- * @param uid
- * @param money
- * @param time
- * @param orderNo
- * @param out
- */
- @RequestMapping(value = "saveMoneyArrival")
- public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String time,
- String orderNo, PrintWriter out) {
- if (uid == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- try {
- String link = previewInfoService.saveMoneyArrival(uid, money, time, orderNo);
- JSONObject object = new JSONObject();
- object.put("link", link);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
- }
}
@RequestMapping(value = "getExtractRecord")
@@ -200,25 +144,103 @@
json.put("list", JSONArray);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
}
+
+ /**
+ * 鍒犻櫎鎻愮幇璁板綍
+ *
+ * @param callback
+ * @param acceptData
+ * @param uid
+ * @param vo
+ * @param out
+ */
+ @RequestMapping(value = "deleteExtractRecord")
+ public void deleteExtractRecord(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+ if (uid == null || id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
+ return;
+ }
+ previewInfoService.deleteExtractRecord(uid, id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ }
+ /**
+ * 淇濆瓨鎴戠殑淇℃伅
+ *
+ * @param callback
+ * @param acceptData
+ * @param infoVO
+ * @param file
+ * @param out
+ */
+ @RequestMapping(value = "saveMineInfo")
+ 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);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ }
+ }
+
@RequestMapping(value = "getMineInfo")
public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.mineInfo);
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.mineInfo);
+ if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
+ return;
+ }
+
+ MineInfoVO dto = new Gson().fromJson(previewInfo.getContent(), MineInfoVO.class);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
}
- @RequestMapping(value = "getMoneyInfo")
- public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.moneyInfo);
+ /**
+ * 鍒拌处棰勮-鐢熶骇鍥剧墖
+ *
+ * @param callback
+ * @param acceptData
+ * @param uid
+ * @param money
+ * @param time
+ * @param orderNo
+ * @param out
+ */
+ @RequestMapping(value = "saveMoneyArrival")
+ public void saveMoneyArrival(String callback, AcceptData acceptData, Long uid, BigDecimal money, String time,
+ String orderNo, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ try {
+ String link = previewInfoService.saveMoneyArrival(uid, money, time, orderNo);
+ JSONObject object = new JSONObject();
+ object.put("link", link);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ }
}
- private void getInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out, PreviewEnum previewEnum) {
- PreviewInfo previewInfo = previewInfoService.get(uid, previewEnum);
+
+ @RequestMapping(value = "getMoneyArrivalImg")
+ public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.moneyInfo);
if (previewInfo == null || StringUtil.isNullOrEmpty(previewInfo.getContent())) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
JSONObject object = new JSONObject();
- object.put("result", previewInfo.getContent());
+ object.put("link", previewInfo.getContent());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
}
+
}
--
Gitblit v1.8.0