From 758a59e77aba29b858698808fedd31c569955357 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 五月 2020 15:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/PreviewInfoControllerV2.java | 78 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 35 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 a8d4646..1596847 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
@@ -61,24 +61,22 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private UserMoneyDetailService userMoneyDetailService;
-
+
@Resource
private OrderMoneyDailyCountService orderMoneyDailyCountService;
-
+
@Resource
private CommonOrderService commonOrderService;
-
+
@Resource
private PushService pushService;
-
-
-
+
/**
* 淇濆瓨璧勯噾淇℃伅
*
@@ -102,7 +100,6 @@
}
}
-
@RequestMapping(value = "getMoneyInfo")
public void getMoneyInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
MoneyStatisticVO dto = null;
@@ -222,7 +219,7 @@
vo.setMonthPredict(cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate)));
return vo;
}
-
+
private MoneyPredictVO cratePredictVO(List<OrderMoneyDailyCount> list) {
MoneyPredictVO predictVO = new MoneyPredictVO();
predictVO.setMineNum(0);
@@ -248,7 +245,7 @@
predictVO.setTotalMoney(predictVO.getMineMoney().add(predictVO.getTeamMoney()));
return predictVO;
}
-
+
/**
* 淇濆瓨鎻愮幇璁板綍
*
@@ -279,9 +276,10 @@
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());
+ list = gson.fromJson(previewInfo.getContent(), new TypeToken<ArrayList<Extract>>() {
+ }.getType());
}
-
+
if (list == null)
list = new ArrayList<>();
@@ -303,14 +301,13 @@
JSONArray.add(object);
}
}
-
JSONObject json = new JSONObject();
json.put("count", JSONArray.size());
json.put("list", JSONArray);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
}
-
+
/**
* 鍒犻櫎鎻愮幇璁板綍
*
@@ -334,7 +331,7 @@
e.printStackTrace();
}
}
-
+
/**
* 鍒犻櫎鎻愮幇璁板綍
*
@@ -364,7 +361,7 @@
* @param out
*/
@RequestMapping(value = "saveMineInfo")
- public void saveMineInfo(String callback, AcceptData acceptData, MineInfoVO infoVO, 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;
@@ -379,7 +376,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
}
}
-
+
@RequestMapping(value = "getMineInfo")
public void getMineInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
PreviewInfo previewInfo = previewInfoService.get(uid, PreviewEnum.mineInfo);
@@ -387,9 +384,9 @@
if (previewInfo != null && !StringUtil.isNullOrEmpty(previewInfo.getContent())) {
dto = new Gson().fromJson(previewInfo.getContent(), MineInfoVO.class);
}
-
+
if (dto == null)
- dto = new MineInfoVO();
+ dto = new MineInfoVO();
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(dto)));
}
@@ -412,14 +409,13 @@
JSONObject object = new JSONObject();
object.put("link", link);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
- } catch (PreviewInfoException e) {
+ } catch (PreviewInfoException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("棰勮澶辫触"));
}
}
-
@RequestMapping(value = "getMoneyArrivalImg")
public void getMoneyArrivalImg(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
@@ -442,35 +438,40 @@
* @param out
*/
@RequestMapping(value = "saveOrderInfo")
- public void saveOrderInfo(String callback, AcceptData acceptData, Long uid, Integer type, Integer num, PrintWriter out) {
+ public void saveOrderInfo(String callback, AcceptData acceptData, Long uid, Integer type, Integer num,
+ PrintWriter out) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (type == null || type < 1 || type > 2) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨璁㈠崟绫诲瀷"));
return;
}
-
+
if (num == null || num <= 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欐帹閫佹暟閲�"));
return;
}
-
+
if (num > 50) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈�澶氭敮鎸�50鏉�"));
return;
}
-
+
// 鑾峰彇鏈�鏂拌鍗曞彿
String orderNo = commonOrderService.getNewestOrderNoByTaoBao();
-
+
// 闅忔満璁㈠崟鍙�
List<String> list = getRandomOrderNo(orderNo, num);
- for (String orderId: list) {
- PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(Constant.SOURCE_TYPE_TAOBAO,
- orderId, BigDecimal.ZERO);
+ // new Thread(new Runnable() {
+ //
+ // @Override
+ // public void run() {
+ for (String orderId : list) {
+ PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(Constant.SOURCE_TYPE_TAOBAO, orderId,
+ BigDecimal.ZERO);
try {
pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);
} catch (NumberFormatException e) {
@@ -478,11 +479,18 @@
} catch (PushException e) {
e.printStackTrace();
}
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
+ // }
+ // }).start();
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
}
-
-
+
private List<String> getRandomOrderNo(String orderNo, int count) {
String newNo = orderNo.substring(0, 3);
long lenth = orderNo.length() - 3;
@@ -500,7 +508,7 @@
set.add(newNo + randomNum);
}
}
-
+
// 杞崲list
List<String> list = new ArrayList<>();
for (String s : set) {
@@ -508,7 +516,7 @@
}
// 鎺掑簭
Collections.sort(list);
-
+
return list;
}
}
--
Gitblit v1.8.0