From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 142 insertions(+), 8 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 060328c..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
@@ -4,6 +4,7 @@
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;
@@ -28,6 +29,8 @@
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;
@@ -37,6 +40,8 @@
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.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;
@@ -49,6 +54,7 @@
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;
@@ -89,6 +95,12 @@
@Resource
private RedisManager redisManager;
+
+// @Resource
+ private TeamOrderStatisticService teamOrderStatisticService;
+
+ @Resource
+ private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
/**
* 璁㈠崟鍒楄〃
@@ -172,6 +184,11 @@
goodsType = null; // 鎵�鏈夊钩鍙拌鍗�
}
+ List<Integer> listSource = new ArrayList<>();
+ if (goodsType != null) {
+ listSource.add(goodsType);
+ }
+
try {
if (slotTime != null) {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
@@ -187,7 +204,6 @@
}
String orderFindUrl = null;
-
try {
long count = 0;
@@ -199,12 +215,12 @@
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, type, orderState,
- orderNo, startTime, endTime, dateType, goodsType);
+ orderNo, startTime, endTime, dateType, listSource);
if (list != null && list.size() > 0) {
// 缁熻鎬绘暟
count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime,
- endTime, dateType, goodsType);
+ endTime, dateType, listSource);
}
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
@@ -232,19 +248,19 @@
if (todayMoney == null) {
todayMoney = new BigDecimal(0.00);
}
-
+
// 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀�
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("order_find_notify_url");
+ 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", configService.get("order_list_help"));
+ data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
if (type != null && type == 1) {
data.put("todayMoney", "棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
@@ -737,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