From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 156 insertions(+), 17 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 44ffd00..b12487c 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,7 +4,6 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -13,6 +12,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.util.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,6 +20,7 @@
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.TimeUtil;
import org.yeshi.utils.encrypt.DESUtil;
import com.yeshi.fanli.entity.AppVersionInfo;
@@ -30,6 +31,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;
@@ -39,17 +42,15 @@
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;
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.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;
@@ -87,6 +88,15 @@
@Resource
private LostOrderService lostOrderService;
+
+ @Resource
+ private RedisManager redisManager;
+
+// @Resource
+ private TeamOrderStatisticService teamOrderStatisticService;
+
+ @Resource
+ private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
/**
* 璁㈠崟鍒楄〃
@@ -170,6 +180,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");
@@ -184,6 +199,8 @@
endTime += " 23:59:59";
}
+ String orderFindUrl = null;
+
try {
long count = 0;
long totalValid = 0;
@@ -194,12 +211,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);
}
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
@@ -228,13 +245,18 @@
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.getValue(ConfigKeyEnum.orderFindNotifyUrl.getKey(), SystemInfoUtil.getSystem(acceptData));
+ }
+ }
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
-
- data.put("helpUrl", helpUrl);
+ data.put("helpUrl", configService.getValue(ConfigKeyEnum.orderListHelp.getKey(),SystemInfoUtil.getSystem(acceptData)));
if (type != null && type == 1) {
data.put("todayMoney", "棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
@@ -248,16 +270,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);
}
-
}
/**
@@ -291,7 +312,7 @@
int versionCode = Integer.parseInt(version);
String platform = acceptData.getPlatform();
- AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");
+ AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0",acceptData.getSystem());
if (versionInfo != null) {
int versionCode150 = versionInfo.getVersionCode();
if (versionCode >= versionCode150) {
@@ -518,7 +539,7 @@
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);
@@ -728,4 +749,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