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 | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 7dd810a..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
@@ -27,6 +27,7 @@
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;
@@ -41,6 +42,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 +97,12 @@
@Resource
private UserSystemCouponRecordService userSystemCouponRecordService;
-
+
@Resource
private ConfigService configService;
-
+
+ @Resource
+ private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -180,12 +184,12 @@
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")));
@@ -194,7 +198,7 @@
return;
}
} else if (riskType == 2) {
- listShopId = commonOrderCountService.getSameShopOrderByUidAndHongBaoType(typeList, uid,
+ 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("鏆傛棤鍚屽簵閾鸿鍗�"));
@@ -205,7 +209,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);
@@ -218,15 +222,15 @@
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.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),
- Long.parseLong(order.getUserId()));
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(
+ weiQuanOrder.getOrderItemId(), Long.parseLong(order.getUserId()));
if (drawBack != null) {// 宸茬粡閫�娆�
// 璁＄畻閫�娆捐祫閲�
@@ -275,7 +279,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());
+ }
}
}
}
@@ -444,8 +455,8 @@
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
- List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
- startTime, endTime);
+ List<ChartTDO> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year, startTime,
+ endTime);
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
@@ -715,8 +726,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", "杩斿埄璁㈠崟");
@@ -805,8 +815,8 @@
JSONArray line_list = new JSONArray();
- List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
- endTime, sourceType);
+ List<ChartTDO> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime, endTime,
+ sourceType);
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
--
Gitblit v1.8.0