From 03f9370b85d930bd232f72721e826b5875f898cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 五月 2020 13:52:58 +0800
Subject: [PATCH] 用户登录后要验证电话号码是否已经绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 126 ++++++++++++++++++++++++++++++-----------
1 files changed, 92 insertions(+), 34 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 38be2bc..c43dd4b 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
@@ -2,6 +2,9 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -10,7 +13,10 @@
import org.springframework.web.multipart.MultipartFile;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+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.exception.user.PreviewInfoException;
@@ -18,9 +24,13 @@
import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.money.MoneyStatisticVO;
import com.yeshi.fanli.vo.user.MineInfoVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Controller
@@ -28,16 +38,16 @@
public class PreviewInfoControllerV2 {
@Resource
private PreviewInfoService previewInfoService;
-
+
@Resource
private UserInfoService userInfoService;
-
+
@Resource
private RedisManager redisManager;
-
-
+
/**
* 淇濆瓨璧勯噾淇℃伅
+ *
* @param callback
* @param acceptData
* @param uid
@@ -57,10 +67,23 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
}
+
+ @RequestMapping(value = "getMoneyInfo")
+ public void getMoneyInfo(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;
+ }
+ MoneyStatisticVO dto = new Gson().fromJson(previewInfo.getContent(), MoneyStatisticVO.class);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dto));
+ }
+
/**
* 淇濆瓨鎻愮幇璁板綍
+ *
* @param callback
* @param acceptData
* @param uid
@@ -68,7 +91,8 @@
* @param out
*/
@RequestMapping(value = "saveExtractRecord")
- public void saveExtractRecord(String callback, AcceptData acceptData, Long uid, String time, BigDecimal money, PrintWriter out) {
+ public void saveExtractRecord(String callback, AcceptData acceptData, Long uid, String time, BigDecimal money,
+ PrintWriter out) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -80,11 +104,45 @@
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
}
-
-
+
+ @RequestMapping(value = "getExtractRecord")
+ public void getExtractRecord(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ List<Extract> list = null;
+ PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.extractRecord);
+ if (previewInfo != null && !StringUtil.isNullOrEmpty(previewInfo.getContent())) {
+ Gson gson = new Gson();
+ list = gson.fromJson(previewInfo.getContent(), new TypeToken<ArrayList<Extract>>() {}.getType());
+ }
+
+ if (list == null)
+ list = new ArrayList<>();
+
+ JSONArray JSONArray = new JSONArray();
+ for (Extract extract : list) {
+ Date receiveTime = extract.getReceiveTime();
+ if (receiveTime == null) {
+ receiveTime = new Date(extract.getExtractTime());
+ }
+ String account = "鏀粯瀹濓細" + UserUtil.filterAlipayAccount(extract.getAccount());
+ account = account + "-濮撳悕锛�" + UserUtil.filterAlipayName(extract.getName());
+
+ JSONObject object = new JSONObject();
+ object.put("id", extract.getId());
+ object.put("title", "浣犱簬" + TimeUtil.formatDate(receiveTime) + "鎻愮幇鎴愬姛");
+ object.put("account", account);
+ object.put("money", "楼" + extract.getMoney().setScale(2).toString());
+ JSONArray.add(object);
+ }
+
+ JSONObject json = new JSONObject();
+ json.put("count", JSONArray.size());
+ json.put("list", JSONArray);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
+ }
/**
* 鍒犻櫎鎻愮幇璁板綍
+ *
* @param callback
* @param acceptData
* @param uid
@@ -100,11 +158,10 @@
previewInfoService.deleteExtractRecord(uid, id);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
}
-
-
-
+
/**
* 淇濆瓨鎴戠殑淇℃伅
+ *
* @param callback
* @param acceptData
* @param infoVO
@@ -112,7 +169,8 @@
* @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, MultipartFile file,
+ PrintWriter out) {
if (infoVO == null || infoVO.getUid() == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -126,9 +184,21 @@
}
}
-
+ @RequestMapping(value = "getMineInfo")
+ public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ 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));
+ }
+
/**
* 鍒拌处棰勮-鐢熶骇鍥剧墖
+ *
* @param callback
* @param acceptData
* @param uid
@@ -144,41 +214,29 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
try {
String link = previewInfoService.saveMoneyArrival(uid, money, time, orderNo);
JSONObject object = new JSONObject();
- object.put("link",link);
+ 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 = "getMoneyInfo")
- public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.moneyInfo);
- }
-
- @RequestMapping(value = "getExtractRecord")
- public void getExtractRecord(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.extractRecord);
- }
-
- @RequestMapping(value = "getMineInfo")
- public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
- getInfo(callback, acceptData, uid, out, PreviewEnum.mineInfo);
- }
-
- private void getInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out, PreviewEnum previewEnum) {
- PreviewInfo previewInfo = previewInfoService.get(uid, previewEnum);
- if (previewInfo == null) {
+
+
+ @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