From 48b511dbf38054a4d6bc4383681ce50fd11df378 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 21:48:20 +0800
Subject: [PATCH] VIP数据预览
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 465 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 403 insertions(+), 62 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
index 855c9c6..8192de8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -3,41 +3,58 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.encrypt.DESUtil;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.order.TeamOrderStatistic;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.order.TeamOrderStatisticService;
+import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.order.TeamOrderStatisticVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import net.sf.json.JSONObject;
@@ -73,6 +90,18 @@
@Resource
private OrderService orderService;
+ @Resource
+ private LostOrderService lostOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
+// @Resource
+ private TeamOrderStatisticService teamOrderStatisticService;
+
+ @Resource
+ private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
+
/**
* 璁㈠崟鍒楄〃
*
@@ -99,14 +128,25 @@
* @param out
*/
@RequestMapping(value = "getorder", method = RequestMethod.POST)
- public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer slotTime, boolean needCount, Integer dateType,
+ public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state,
+ @RequestParam(name = "type", required = false) String type1, Integer orderState, String orderNo,
+ String startTime, String endTime, Integer slotTime, Boolean needCount, Integer dateType, Integer goodsType,
PrintWriter out) {
+ Integer type = null;
+
+ if (StringUtil.isNullOrEmpty(type1)) {
+ type = null;
+ } else {
+ type = Integer.parseInt(type1);
+ }
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
+
+ if (needCount == null)
+ needCount = false;
if (page == null || page < 1) {
page = 1;
@@ -122,8 +162,31 @@
state = null; // 娓呯┖
}
+ // 杞崲鐘舵��
+ if (state != null && state == 5) {
+ orderState = 2; // 宸茬淮鏉�
+ state = null; // 娓呯┖
+ }
+
if (type != null && type == 0) {
type = null; // 鎵�鏈夌被鍨嬭鍗�
+ }
+
+ Integer tempState = state;
+ // 杞崲鐘舵��
+ if (state != null && orderState != null && (orderState == 2 || orderState == 3)) {
+ state = null; // 娓呯┖
+ }
+
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ } else if (goodsType != null && goodsType == 0) {
+ goodsType = null; // 鎵�鏈夊钩鍙拌鍗�
+ }
+
+ List<Integer> listSource = new ArrayList<>();
+ if (goodsType != null) {
+ listSource.add(goodsType);
}
try {
@@ -140,59 +203,64 @@
endTime += " 23:59:59";
}
+ String orderFindUrl = null;
+
try {
long count = 0;
- int totalValid = 0;
- int totalProces = 0;
- int totalInvite = 0;
+ long totalValid = 0;
+ long totalProces = 0;
+ long totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
// 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState, orderNo,
- startTime, endTime, dateType);
+ List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, type, orderState,
+ orderNo, startTime, endTime, dateType, listSource);
if (list != null && list.size() > 0) {
// 缁熻鎬绘暟
count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime,
- endTime, dateType);
+ endTime, dateType, listSource);
}
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
+ todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime,
+ goodsType);
- todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+ todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime,
+ goodsType);
- // 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
- Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime,
- endTime, dateType);
+ // 鏈夋晥璁㈠崟
+ totalValid = commonOrderService.countUserOrderToApp(uid, type, startTime, endTime, dateType, goodsType,
+ tempState, 1);
- if (countOrder.get("totalValid") != null) {
- totalValid = countOrder.get("totalValid").intValue();
- }
+ // 缁存潈璁㈠崟
+ totalProces = commonOrderService.countUserOrderToApp(uid, type, startTime, endTime, dateType, goodsType,
+ null, 2);
- if (countOrder.get("totalProces") != null) {
- totalProces = countOrder.get("totalProces").intValue();
- }
-
- if (countOrder.get("totalInvite") != null) {
- totalInvite = countOrder.get("totalInvite").intValue();
- }
+ // 澶辨晥璁㈠崟
+ totalInvite = commonOrderService.countUserOrderToApp(uid, type, startTime, endTime, dateType, goodsType,
+ null, 3);
}
if (todayMoney == null) {
todayMoney = new BigDecimal(0.00);
}
- String helpUrl = configService.get("order_list_help");
+ // 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀�
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion()))
+ if (state == null && page == 1) {
+ if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {// 8绉掑唴璇锋眰3娆¤Е鍙�
+ orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
+ }
+ }
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
-
- data.put("helpUrl", helpUrl);
+ data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
if (type != null && type == 1) {
data.put("todayMoney", "棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
@@ -206,16 +274,15 @@
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
data.put("totalInvite", totalInvite); // 澶辨晥鏁伴噺
-
+ if (orderFindUrl != null)
+ data.put("findOrderHelpUrl", orderFindUrl);
out.print(JsonUtil.loadTrueResult(data));
-
} catch (CommonOrderException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
- e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
}
-
}
/**
@@ -269,8 +336,13 @@
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
+ Integer goodsType = null; // 鐗堟湰鍖哄垎
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
/* 鎬昏鍗曠粺璁� */
- Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null);
+ Map<String, BigDecimal> countOrder = commonOrderService.countHistoryOrder(uid, null, goodsType);
int self = 0;
if (countOrder.get("totalSelf") != null) {
self = countOrder.get("totalSelf").intValue();
@@ -294,7 +366,7 @@
data.put("invite", invite);
/* 浠婃棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1);
+ Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
int todaySelf = 0;
if (countToday.get("totalSelf") != null) {
@@ -322,7 +394,7 @@
data.put("today", todaydata);
/* 鏄ㄦ棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2);
+ Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, goodsType);
int yesterdaySelf = 0;
if (countYesterday.get("totalSelf") != null) {
yesterdaySelf = countYesterday.get("totalSelf").intValue();
@@ -355,6 +427,83 @@
}
/**
+ * 缁熻鍚勪釜骞冲彴鏁版嵁
+ *
+ * @param acceptData
+ * @param uid
+ * @param goodsType
+ * @param out
+ */
+ @RequestMapping(value = "getNearOrderNum", method = RequestMethod.POST)
+ public void getNearOrderNum(AcceptData acceptData, Long uid, Integer goodsType, PrintWriter out) {
+
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (goodsType == null || goodsType > 3 || goodsType < 1) {
+ out.print(JsonUtil.loadFalseResult(1, "骞冲彴绫诲瀷缂哄け鎴栦笉姝ｇ‘"));
+ return;
+ }
+
+ /* 浠婃棩璁㈠崟缁熻 */
+ Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
+
+ int todaySelf = 0;
+ if (countToday.get("totalSelf") != null) {
+ todaySelf = countToday.get("totalSelf").intValue();
+ }
+
+ int todayShared = 0;
+ if (countToday.get("totalShared") != null) {
+ todayShared = countToday.get("totalShared").intValue();
+ }
+
+ int todayInvite = 0;
+ if (countToday.get("totalInvite") != null) {
+ todayInvite = countToday.get("totalInvite").intValue();
+ }
+
+ int todayTotal = todaySelf + todayShared + todayInvite;
+
+ JSONObject todaydata = new JSONObject();
+ todaydata.put("total", todayTotal);
+ todaydata.put("self", todaySelf);
+ todaydata.put("shared", todayShared);
+ todaydata.put("invite", todayInvite);
+
+ /* 鏄ㄦ棩璁㈠崟缁熻 */
+ Map<String, BigDecimal> countYesterday = commonOrderService.countHistoryOrder(uid, 2, goodsType);
+ int yesterdaySelf = 0;
+ if (countYesterday.get("totalSelf") != null) {
+ yesterdaySelf = countYesterday.get("totalSelf").intValue();
+ }
+
+ int yesterdayShared = 0;
+ if (countYesterday.get("totalShared") != null) {
+ yesterdayShared = countYesterday.get("totalShared").intValue();
+ }
+ int yesterdayInvite = 0;
+ if (countYesterday.get("totalInvite") != null) {
+ yesterdayInvite = countYesterday.get("totalInvite").intValue();
+ }
+ int yesterdayTotal = yesterdaySelf + yesterdayShared + yesterdayInvite;
+
+ JSONObject yesterdaydata = new JSONObject();
+ yesterdaydata.put("total", yesterdayTotal);
+ yesterdaydata.put("self", yesterdaySelf);
+ yesterdaydata.put("shared", yesterdayShared);
+ yesterdaydata.put("invite", yesterdayInvite);
+
+ JSONObject data = new JSONObject();
+
+ data.put("today", todaydata);
+ data.put("yesterday", yesterdaydata);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+ /**
* 缁熻濂栭噾
*
* @param acceptData
@@ -363,45 +512,74 @@
*/
@RequestMapping(value = "countBonus", method = RequestMethod.POST)
public void countBonus(AcceptData acceptData, Long uid, Integer dateType, PrintWriter out) {
-
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
- try {
+ long nowTime = System.currentTimeMillis();
+ long recievedTime = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyy-MM") + "-25 10",
+ "yyyy-MM-dd HH");
+ try {
Object shareCount = 0;
BigDecimal sharemoney = new BigDecimal(0.00);
Object inviteCount = 0;
BigDecimal inviteMoney = new BigDecimal(0.00);
- Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 2, dateType, null,
- null);
- if (shareMap != null) {
- Object totalNum = shareMap.get("totalNum");
- if (totalNum != null) {
- shareCount = totalNum;
+ if (nowTime > recievedTime && dateType == 4) {// 瀹為檯鍒拌处
+ List<Integer> inviteTypes = new ArrayList<>();
+ inviteTypes.add(HongBaoV2.TYPE_YIJI);
+ inviteTypes.add(HongBaoV2.TYPE_ERJI);
+ inviteTypes.add(HongBaoV2.TYPE_SHARE_YIJI);
+ inviteTypes.add(HongBaoV2.TYPE_SHARE_ERJI);
+
+ List<Integer> shareTypes = new ArrayList<>();
+ shareTypes.add(HongBaoV2.TYPE_SHARE_GOODS);
+
+ Date minGetTime = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(nowTime, "yyyy-MM") + "-25", "yyyy-MM-dd"));
+
+ Date maxGetTime = new Date(nowTime);
+ inviteMoney = hongBaoV2CountService.sumAlreadyGetMoneyByUid(uid, inviteTypes, minGetTime, maxGetTime);
+ inviteCount = hongBaoV2CountService.countAlreadyGetMoneyByUid(uid, inviteTypes, minGetTime, maxGetTime);
+
+ sharemoney = hongBaoV2CountService.sumAlreadyGetMoneyByUid(uid, shareTypes, minGetTime, maxGetTime);
+ shareCount = hongBaoV2CountService.countAlreadyGetMoneyByUid(uid, shareTypes, minGetTime, maxGetTime);
+
+ } else {// 棰勪及鍒拌处
+ Integer goodsType = null; // 鐗堟湰鍖哄垎
+ if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+ Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 2, dateType, null,
+ null, goodsType);
+ if (shareMap != null) {
+ Object totalNum = shareMap.get("totalNum");
+ if (totalNum != null) {
+ shareCount = totalNum;
+ }
+
+ Object totalmoney = shareMap.get("totalmoney");
+ if (totalmoney != null) {
+ sharemoney = (BigDecimal) totalmoney;
+ }
}
- Object totalmoney = shareMap.get("totalmoney");
- if (totalmoney != null) {
- sharemoney = (BigDecimal) totalmoney;
- }
- }
+ // 閭�璇风粺璁�
- // 閭�璇风粺璁�
- Map<String, Object> inviteMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 3, dateType, null,
- null);
- if (inviteMap != null) {
- Object totalNum = inviteMap.get("totalNum");
- if (totalNum != null) {
- inviteCount = totalNum;
- }
+ Map<String, Object> inviteMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 3, dateType, null,
+ null, goodsType);
+ if (inviteMap != null) {
+ Object totalNum = inviteMap.get("totalNum");
+ if (totalNum != null) {
+ inviteCount = totalNum;
+ }
- Object totalmoney = inviteMap.get("totalmoney");
- if (totalmoney != null) {
- inviteMoney = (BigDecimal) totalmoney;
+ Object totalmoney = inviteMap.get("totalmoney");
+ if (totalmoney != null) {
+ inviteMoney = (BigDecimal) totalmoney;
+ }
}
}
@@ -430,7 +608,8 @@
* @param out
*/
@RequestMapping(value = "uploadParsedOrder", method = RequestMethod.POST)
- public void uploadParsedOrder(AcceptData acceptData, Long uid, String orderData, String source, PrintWriter out) {
+ public void uploadParsedOrder(AcceptData acceptData, Long uid, String orderData, String source,
+ HttpServletRequest request, PrintWriter out) {
if (uid == null || StringUtil.isNullOrEmpty(orderData)) {
out.print(JsonUtil.loadFalseResult(1, "鏁版嵁閿欒"));
return;
@@ -446,14 +625,32 @@
}
if ("findOrder".equalsIgnoreCase(source)) {
+
+ boolean success = false;
// 鍖归厤璁㈠崟
for (String order : orders) {
if (!StringUtil.isNullOrEmpty(order)) {
List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(order);
+ // 璁＄畻璁㈠崟鐘舵��
+
if (orderList != null && orderList.size() > 0) {
+ int inValid = 0;
+ for (TaoBaoOrder taoBaoOrder : orderList) {
+ if (taoBaoOrder.getOrderState().equalsIgnoreCase("璁㈠崟澶辨晥")) {
+ inValid++;
+ }
+ }
+ // 璁㈠崟鍏ㄦ槸澶辨晥
+ if (inValid == orderList.size())
+ continue;
+
List<CommonOrder> commonOrderList = commonOrderService
.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, order);
if (commonOrderList == null || commonOrderList.size() == 0) {
+ Order o = orderService.findOrderByOrderIdAndType(order, Order.ORDER_TYPE_TAOBAO);
+ if (o != null)// 鍘熸潵宸茬粡瀛樺湪锛屽垯涓嶉渶瑕佹壘鍥�
+ continue;
+
Order or = new Order();
or.setBeizhu("浜哄伐鑷姩鎵惧洖琛ュ崟");
or.setCreatetime(System.currentTimeMillis());
@@ -467,15 +664,41 @@
try {
isS = orderService.addOrder(or);
if (isS) {
- CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
+ CMQManager.getInstance().addTaoBaoOrderMsg(order);
+ // 鍔犲叆鍒癓ostOrder
+ LostOrder lo = new LostOrder();
+ lo.setCreateTime(System.currentTimeMillis());
+ lo.setHandleTime(System.currentTimeMillis());
+ lo.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
+ lo.setOrder(or);
+ lo.setOrderId(order);
+ lo.setState(LostOrder.STATE_PASS);
+ lo.setResultCode(LostOrder.RESULT_CODE_VERFING);
+ lo.setType(LostOrder.TYPE_TAOBAO);
+ lo.setUserInfo(new UserInfo(uid));
+ lostOrderService.saveLostOrder(lo);
+ if (success == false)
+ success = true;
}
} catch (Exception e) {
- e.printStackTrace();
+ try {
+ LogHelper.errorDetailInfo(e, order, "");
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
}
}
}
}
+ if (success) {
+ out.print(JsonUtil.loadTrue(0, null, "璁㈠崟鎵惧洖鎴愬姛锛岃鍒扳�滄垜鐨�-璁㈠崟鈥濅腑鏌ョ湅"));
+ return;
+ } else {
+ out.print(JsonUtil.loadFalseResult("娌℃湁鍙壘鍥炵殑璁㈠崟锛岃灏濊瘯鎵嬪姩鎵惧洖"));
+ return;
+ }
+
} else {
String orderId = null;
if (orders != null && orders.length > 0)
@@ -530,4 +753,122 @@
return startTime;
}
+
+ /**
+ * 鑾峰彇鍥㈤槦璁㈠崟缁熻
+ * @Title: getTeamOrderStatistic
+ * @Description:
+ * @param acceptData
+ * @param uid
+ * @param out
+ * void 杩斿洖绫诲瀷
+ * @throws
+ */
+ @RequestMapping(value = "getTeamOrderStatistic")
+ public void getTeamOrderStatistic(AcceptData acceptData, Long uid, PrintWriter out) {
+ long now = System.currentTimeMillis();
+ TeamOrderStatisticVO vo = new TeamOrderStatisticVO();
+ Date minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now, "yyyyMMdd"), "yyyyMMdd"));
+ Date maxDate = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now + 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd"));
+ List<Integer> countList = new ArrayList<>();
+ // 缁熻浠婃棩
+ TeamOrderStatistic statistic = teamOrderStatisticService.countByUidAndDate(uid, minDate, maxDate);
+ if (statistic == null) {
+ countList.add(0);
+ countList.add(0);
+ countList.add(0);
+ } else {
+ countList.add(statistic.getDirectOrderCount() == null ? 0 : statistic.getDirectOrderCount());
+ countList.add(statistic.getInDirectOrderCount() == null ? 0 : statistic.getInDirectOrderCount());
+ countList.add(statistic.getOtherOrderCount() == null ? 0 : statistic.getOtherOrderCount());
+ }
+
+ vo.setToday(countList);
+
+ // 缁熻鏄ㄦ棩
+ minDate = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 1000 * 60 * 60 * 24L, "yyyyMMdd"), "yyyyMMdd"));
+ maxDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now, "yyyyMMdd"), "yyyyMMdd"));
+
+ countList = new ArrayList<>();
+ statistic = teamOrderStatisticService.countByUidAndDate(uid, minDate, maxDate);
+ if (statistic == null) {
+ countList.add(0);
+ countList.add(0);
+ countList.add(0);
+ } else {
+ countList.add(statistic.getDirectOrderCount() == null ? 0 : statistic.getDirectOrderCount());
+ countList.add(statistic.getInDirectOrderCount() == null ? 0 : statistic.getInDirectOrderCount());
+ countList.add(statistic.getOtherOrderCount() == null ? 0 : statistic.getOtherOrderCount());
+ }
+
+ vo.setYesterday(countList);
+
+ // 缁熻鏈湀
+
+ minDate = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(now - 1000 * 60 * 60 * 24L, "yyyyMM"), "yyyyMM"));
+ Calendar ca = Calendar.getInstance();
+ ca.setTimeInMillis(now);
+
+ ca.add(Calendar.MONTH, 1);
+
+ maxDate = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyyMM"), "yyyyMM"));
+
+ countList = new ArrayList<>();
+ statistic = teamOrderStatisticService.countByUidAndDate(uid, minDate, maxDate);
+ if (statistic == null) {
+ countList.add(0);
+ countList.add(0);
+ countList.add(0);
+ } else {
+ countList.add(statistic.getDirectOrderCount() == null ? 0 : statistic.getDirectOrderCount());
+ countList.add(statistic.getInDirectOrderCount() == null ? 0 : statistic.getInDirectOrderCount());
+ countList.add(statistic.getOtherOrderCount() == null ? 0 : statistic.getOtherOrderCount());
+ }
+
+ vo.setThisMonth(countList);
+
+ // 缁熻 绱
+ minDate = new Date(0L);
+ maxDate = new Date(now);
+ countList = new ArrayList<>();
+ statistic = teamOrderStatisticService.countByUidAndDate(uid, minDate, maxDate);
+ if (statistic == null) {
+ countList.add(0);
+ countList.add(0);
+ countList.add(0);
+ } else {
+ countList.add(statistic.getDirectOrderCount() == null ? 0 : statistic.getDirectOrderCount());
+ countList.add(statistic.getInDirectOrderCount() == null ? 0 : statistic.getInDirectOrderCount());
+ countList.add(statistic.getOtherOrderCount() == null ? 0 : statistic.getOtherOrderCount());
+ }
+
+ vo.setTotal(countList);
+ }
+
+ /**
+ * 鑾峰彇鍥㈤槦璁㈠崟鎺掕
+ * @Title: getTeamOrderRank
+ * @Description:
+ * @param acceptData
+ * @param uid
+ * @param type 1-浠婃棩 2-鏄ㄦ棩 3-鏈湀
+ * @param out
+ * void 杩斿洖绫诲瀷
+ * @throws
+ */
+ @RequestMapping(value = "getTeamOrderRank")
+ public void getTeamOrderRank(AcceptData acceptData, Long uid, int type, PrintWriter out) {
+ // TODO 闇�姹備笉鏄庣‘
+
+ }
+
+ @RequestMapping(value = "searchOrderTeam")
+ public void searchOrderTeam(AcceptData acceptData, String key, PrintWriter out) {
+// teamDividentsSourceOrderService.selectByOrderNoSourceType(orderNo, sourceType);
+ }
+
}
--
Gitblit v1.8.0