From b800d0831438a2d354910a16325c1db6f2fb1231 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 17:41:21 +0800
Subject: [PATCH] 高危标识
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 151f10f..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;
@@ -19,6 +20,7 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
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;
@@ -28,6 +30,7 @@
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;
@@ -92,6 +95,10 @@
@Resource
private UserSystemCouponRecordService userSystemCouponRecordService;
+
+ @Resource
+ private ConfigService configService;
+
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -146,7 +153,7 @@
@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 sourceType,
- PrintWriter out) {
+ Integer riskType, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -168,13 +175,44 @@
}
try {
+ 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, sourceType);
+ state, type, orderState, startTime, endTime, sourceType, listShopId, listGoodsId, minTime, money);
// 缁熻鎬绘暟
long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
- sourceType);
+ sourceType, listShopId, listGoodsId, minTime, money);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
--
Gitblit v1.8.0