From c8f11c229b87d1652b6da0b15576c166cd51eb8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 一月 2020 14:25:22 +0800
Subject: [PATCH] 首页悬浮图mapperbug修改，增加商品详情中的比例展示
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 167 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 132 insertions(+), 35 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 35b471a..1497016 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
@@ -1,7 +1,9 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -10,30 +12,44 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
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;
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.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.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;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import net.sf.json.JSONArray;
@@ -69,6 +85,24 @@
@Resource
private UserMoneyDetailService userMoneyDetailService;
+
+ @Resource
+ private OrderProcessService orderProcessService;
+
+ @Resource
+ private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
+
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -122,7 +156,8 @@
*/
@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, PrintWriter out) {
+ Integer state, Integer type, Integer orderState, String startTime, String endTime, Integer sourceType,
+ Integer riskType, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -144,29 +179,60 @@
}
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);
+ 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);
- }
+ // 缁熻鎬绘暟
+ long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime,
+ sourceType, listShopId, listGoodsId, minTime, money);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
+ 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
- .selectByOrderItemId(weiQuanOrder.getOrderItemId());
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(
+ weiQuanOrder.getOrderItemId(), Long.parseLong(order.getUserId()));
if (drawBack != null) {// 宸茬粡閫�娆�
-
+
// 璁＄畻閫�娆捐祫閲�
UserMoneyDetail detail = null;
switch (order.getHongBaoType()) {
@@ -194,11 +260,33 @@
// 閫�娆炬垚鍔�
order.setWeiQuanBackMoney(detail.getMoney().abs().toString());
} else {// 灏氭湭閫�娆�
- order.setWeiQuanBackMoney("-" + order.getHongBao());
+ order.setWeiQuanBackMoney(drawBack.getDrawBackMoney().toString());
+ // 鏌ヨ鍑哄搴旂殑hongBaoId
+ CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(
+ Constant.SOURCE_TYPE_TAOBAO, drawBack.getOrderItemId());
+ if (commonOrder != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderService
+ .selectDetailByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder != null) {
+ UserMoneyDebt debt = userMoneyDebtService.selectByTypeAndSourceId(
+ UserMoneyDebtTypeEnum.order, hongBaoOrder.getHongBaoV2().getId());
+ if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0) {
+ order.setWeiQuanBackMoney(
+ new BigDecimal(0).subtract(debt.getLeftMoney()).toString());// 鏈墸闄�
+ }
+ }
+ }
}
} 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());
+ }
}
}
}
@@ -367,8 +455,8 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year, startTime,
+ endTime);
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
@@ -492,7 +580,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;
@@ -536,7 +623,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) {
@@ -561,7 +648,6 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
line_list.add(innerList);
}
@@ -571,9 +657,7 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
data.put("line_list", line_list);
-
return data;
}
@@ -593,7 +677,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));
@@ -640,15 +723,10 @@
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,
- endTime);
-
+ List<ChartTDO> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime, endTime);
JSONObject innerList = new JSONObject();
if (type == 1) {
innerList.put("name", "杩斿埄璁㈠崟");
@@ -691,7 +769,7 @@
}
/**
- * 璁㈠崟璺熻釜鍑嗙‘鐜�(杩斿埄鍒哥敤鎴疯鍗�/娣樺疂鑱旂洘璁㈠崟)
+ * 璁㈠崟璺熻釜鍑嗙‘鐜�(鏉挎牀蹇渷鐢ㄦ埛璁㈠崟/娣樺疂鑱旂洘璁㈠崟)
*
* @param callback
* @param dateType
@@ -702,7 +780,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;
@@ -737,8 +815,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", "鎬昏");
@@ -901,7 +979,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) {
@@ -937,4 +1015,23 @@
return data;
}
+ @RequestMapping(value = "uploadTaoBaoWeiQuanOrder")
+ public void uploadWeiQuanOrder(String callback, HttpServletRequest request, PrintWriter out) {
+ try {
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = fileRequest.getFile("file");
+ List<TaoBaoWeiQuanOrder> orderList = TaoBaoOrderUtil.getWeiQuanOrders(file.getInputStream());
+ for (TaoBaoWeiQuanOrder order : orderList)
+ taoBaoWeiQuanOrderService.addWeiQuanOrder(order);// 娣诲姞缁存潈璁㈠崟鍒版暟鎹簱
+ // 澶勭悊缁存潈璁㈠崟
+ orderProcessService.weiQuanOrder(orderList);
+ }
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鏇存柊鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏇存柊澶辫触"));
+ }
+ }
+
}
--
Gitblit v1.8.0