From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 279 ++++++-------------------------------------------------
1 files changed, 32 insertions(+), 247 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 84bf835..c0de37e 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
@@ -27,6 +27,8 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
+import com.yeshi.fanli.entity.order.UserOrderWeiQuanRecord;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
@@ -41,6 +43,7 @@
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.order.UserOrderWeiQuanRecordService;
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;
@@ -95,10 +98,12 @@
@Resource
private UserSystemCouponRecordService userSystemCouponRecordService;
-
+
@Resource
private ConfigService configService;
-
+
+ @Resource
+ private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -180,22 +185,22 @@
List<Long> listShopId = null;
List<Long> listGoodsId = null;
// 椋庨櫓
- if (riskType != null && !StringUtil.isNullOrEmpty(key) && keyType!= null && keyType == 2) {
+ 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")));
+ Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameGoodsOrderCount.getKey())));
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")));
+ listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,
+ Integer.parseInt(configService.get(ConfigKeyEnum.adminMinSameShopOrderCount.getKey())));
if (listShopId == null || listShopId.isEmpty()) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鍚屽簵閾鸿鍗�"));
return;
@@ -205,7 +210,7 @@
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, listShopId, listGoodsId, minTime, money);
@@ -216,17 +221,17 @@
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
- if (order.getUserInfo() == null || order.getUserInfo().getId() == null)
+ if (order.getUserId() == null)
continue;
-
+
// 鏌ヨ鏄惁缁存潈
TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());
if (weiQuanOrder != null)// 鏈夌淮鏉�
{
order.setWeiQuanState(weiQuanOrder.getState());
order.setState(CommonOrder.STATE_WQ);
- TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),
- order.getUserInfo().getId());
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(
+ weiQuanOrder.getOrderItemId(), Long.parseLong(order.getUserId()));
if (drawBack != null) {// 宸茬粡閫�娆�
// 璁＄畻閫�娆捐祫閲�
@@ -275,7 +280,14 @@
}
} else {// 灏氭湭閫�娆�
- order.setWeiQuanBackMoney("-" + order.getHongBao());
+ UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService.selectByOrderInfoAndUid(
+ Long.parseLong(order.getUserId()), weiQuanOrder.getOrderItemId(),
+ Constant.SOURCE_TYPE_TAOBAO);
+ if (record != null)
+ order.setWeiQuanBackMoney("-" + record.getMoney());
+ else {
+ order.setWeiQuanBackMoney("-" + order.getHongBao());
+ }
}
}
}
@@ -370,156 +382,12 @@
}
}
- /**
- * 缁熻鍘嗗彶娓犻亾浜х敓璁㈠崟鐨勯噾棰�
- *
- * @param callback
- * @param channelArray
- * 鍚嶅瓧鏁扮粍
- * @param type
- * 缁熻绫诲瀷 1-24灏忔椂 2-鎵�鏈�
- * @param dateType
- * 绫诲瀷 1鏃� 2鏈� 3骞�
- * @param year
- * 2018
- * @param startTime
- * 2018-12-01
- * @param endTime
- * 2018-12-01
- * @param out
- */
- @RequestMapping(value = "get24HOderChannelCharts")
- public void get24HOderChannelCharts(String callback, String channelArray, Integer dateType, 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));
- return;
- }
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- List<String> channelList = null;
- if (channelArray != null && channelArray.trim().length() > 0) {
- Gson gson = new Gson();
- channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
- }.getType());
- }
-
- if (channelList == null || channelList.size() == 0) {
- channelList = new ArrayList<String>();
- channelList.add("all");
- }
-
- if (dateType == 1 && year != null) {
- year = null; // 璁剧疆涓虹┖
- } else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
- } else if (dateType == 3) {
- if (year != null)
- year = null;
-
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
- }
-
- try {
-
- Gson gson = new Gson();
- Object objectDate = null;
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
- JSONArray line_list = new JSONArray();
-
- for (String channel : channelList) {
- List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
- startTime, endTime);
-
- if ("all".equalsIgnoreCase(channel)) {
- channel = "鎬昏";
- }
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", channel);
-
- if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
- } else {
- // 骞磋鍥�
- Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
- if (objectDate == null) {
- objectDate = map.get("date");
- }
- innerList.put("data", gson.toJson(map.get("value")));
- }
-
- line_list.add(innerList);
- }
-
- JSONObject data = new JSONObject();
- if (objectDate != null) {
- data.put("xAxis_list", gson.toJson(objectDate));
- } else {
- data.put("xAxis_list", gson.toJson(dateList));
- }
-
- data.put("line_list", line_list);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
- /**
- * 缁熻鎻愮幇鐢宠鎬绘鏁�
- *
- * @param callback
- * @param channelArray
- * 娓犻亾鍚� 涓虹┖鏄粺璁℃墍鏈�
- * @param dateType
- * 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
- * @param state
- * 鐘舵�侊細 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getHongBaoNum")
- public void getHongBaoNum(String callback, String channelArray, Integer dateType, Integer state, 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));
- return;
- }
-
- try {
- JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 1);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
-
+
+
+
+
+
+
/**
* 缁熻鎻愮幇鐢宠鎬婚噾棰�
*
@@ -715,8 +583,7 @@
try {
JSONArray line_list = new JSONArray();
for (Integer type : channelList) {
- List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,
- endTime);
+ List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime, endTime);
JSONObject innerList = new JSONObject();
if (type == 1) {
innerList.put("name", "杩斿埄璁㈠崟");
@@ -758,88 +625,6 @@
}
}
- /**
- * 璁㈠崟璺熻釜鍑嗙‘鐜�(鏉挎牀蹇渷鐢ㄦ埛璁㈠崟/娣樺疂鑱旂洘璁㈠崟)
- *
- * @param callback
- * @param dateType
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getTrackAccuracyRate")
- public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,
- int sourceType, PrintWriter out) {
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- if (dateType == 1 && year != null) {
- year = null; // 璁剧疆涓虹┖
- } else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
- } else if (dateType == 3) {
- if (year != null)
- year = null;
-
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
- }
-
- try {
-
- Gson gson = new Gson();
- Object objectDate = null;
- List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
- JSONArray line_list = new JSONArray();
-
- List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
- endTime, sourceType);
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "鎬昏");
-
- if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
- } else {
- // 骞磋鍥�
- Map<String, Object> map = AdminUtils.yearsDataFactory(list);
-
- if (objectDate == null) {
- objectDate = map.get("date");
- }
- innerList.put("data", gson.toJson(map.get("value")));
- }
-
- line_list.add(innerList);
-
- JSONObject data = new JSONObject();
- if (objectDate != null) {
- data.put("xAxis_list", gson.toJson(objectDate));
- } else {
- data.put("xAxis_list", gson.toJson(dateList));
- }
-
- data.put("line_list", line_list);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
/**
* 褰撳墠鏈敹璐ц鍗曟暟
--
Gitblit v1.8.0