From e915a40b79552686b8d8a8cfc48a341fa2c0f518 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 27 十一月 2019 18:08:47 +0800
Subject: [PATCH] 订单统计 + 资金明细
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index b8af594..252d761 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -18,8 +19,10 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
-import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;
+import com.yeshi.fanli.dto.ChartTDO;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.money.UserMoneyDebt;
+import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.order.CommonOrder;
@@ -27,18 +30,20 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;
import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
+import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
-import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -87,6 +92,13 @@
@Resource
private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
+
+ @Resource
+ private ConfigService configService;
+
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -139,9 +151,9 @@
* @param out
*/
@RequestMapping(value = "getUserOrderList")
- public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType,
- String key, Integer state, Integer type, Integer orderState, String startTime, String endTime,
- Integer source, PrintWriter out) {
+ public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,
+ Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,
+ Integer riskType, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -163,16 +175,44 @@
}
try {
- long count = 0;
-
+ Date minTime = null;
+ BigDecimal money = null;
+ List<Long> listShopId = null;
+ List<Long> listGoodsId = null;
+ // 椋庨櫓
+ if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType!= null && keyType == 2) {
+ long uid = Long.parseLong(key);
+ // 鏌ヨ鍚屽簵閾哄晢鍝侊紝鍚屽晢鍝佽鍗曡秴杩囦竴瀹氭暟閲忕殑
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_ZIGOU);
+
+ if (riskType == 1) {
+ listGoodsId = commonOrderCountService.getSameGoodsOrderByUidAndHongBaoType(typeList, uid,
+ Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
+ if (listGoodsId == null || listGoodsId.isEmpty()) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鍚屽晢鍝佽鍗�"));
+ return;
+ }
+ } else if (riskType == 2) {
+ listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,
+ Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
+ if (listShopId == null || listShopId.isEmpty()) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鍚屽簵閾鸿鍗�"));
+ return;
+ }
+ } else if (riskType == 3) {
+ money = new BigDecimal(100);
+ minTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 180L);
+ }
+ }
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime, source);
+ state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money);
- if (list != null && list.size() > 0) {
- // 缁熻鎬绘暟
- count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
- }
+ // 缁熻鎬绘暟
+ long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
+ sourceType, listShopId, listGoodsId, minTime, money);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
@@ -225,7 +265,7 @@
UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());
if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0) {
order.setWeiQuanBackMoney(
- new BigDecimal(0).subtract(debt.getLeftMoney()).toString());//鏈墸闄�
+ new BigDecimal(0).subtract(debt.getLeftMoney()).toString());// 鏈墸闄�
}
}
}
@@ -401,7 +441,7 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
+ List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
startTime, endTime);
if ("all".equalsIgnoreCase(channel)) {
@@ -526,7 +566,6 @@
*/
public JSONObject countHistoryHongBao(String channelArray, Integer dateType, Integer state, String year,
String startTime, String endTime, int countType) throws Exception {
-
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
@@ -570,7 +609,7 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<Map<String, Object>> list = null;
+ List<ChartTDO> list = null;
if (countType == 1) {
list = hongBaoV2CountService.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
} else if (countType == 2) {
@@ -595,7 +634,6 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
line_list.add(innerList);
}
@@ -605,9 +643,7 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
data.put("line_list", line_list);
-
return data;
}
@@ -627,7 +663,6 @@
@RequestMapping(value = "getTypeNumber")
public void getTypeNumber(String callback, Integer dateType, String typeArray, String year, String startTime,
String endTime, PrintWriter out) {
-
String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
@@ -674,15 +709,11 @@
Gson gson = new Gson();
Object objectDate = null;
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
try {
-
JSONArray line_list = new JSONArray();
for (Integer type : channelList) {
-
- List<Map<String, Object>> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,
+ List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,
endTime);
-
JSONObject innerList = new JSONObject();
if (type == 1) {
innerList.put("name", "杩斿埄璁㈠崟");
@@ -725,7 +756,7 @@
}
/**
- * 璁㈠崟璺熻釜鍑嗙‘鐜�(杩斿埄鍒哥敤鎴疯鍗�/娣樺疂鑱旂洘璁㈠崟)
+ * 璁㈠崟璺熻釜鍑嗙‘鐜�(鏉挎牀蹇渷鐢ㄦ埛璁㈠崟/娣樺疂鑱旂洘璁㈠崟)
*
* @param callback
* @param dateType
@@ -736,7 +767,7 @@
*/
@RequestMapping(value = "getTrackAccuracyRate")
public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,
- PrintWriter out) {
+ int sourceType, PrintWriter out) {
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
@@ -771,8 +802,8 @@
JSONArray line_list = new JSONArray();
- List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
- endTime);
+ List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
+ endTime, sourceType);
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
@@ -935,7 +966,7 @@
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
JSONArray line_list = new JSONArray();
- List<Map<String, Object>> list = null;
+ List<ChartTDO> list = null;
if (countType == 1) {
list = commonOrderCountService.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
} else if (countType == 2) {
--
Gitblit v1.8.0