From ee582a5d091966cf2324653c53a7553623e09730 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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..bab2b60 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
@@ -30,15 +30,16 @@
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 +88,9 @@
@Resource
private UserMoneyDebtService userMoneyDebtService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
@@ -139,9 +143,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,
+ PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -163,16 +167,13 @@
}
try {
- long count = 0;
-
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime, source);
+ state, type, orderState, startTime, endTime, sourceType);
- 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);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
@@ -225,7 +226,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());// 鏈墸闄�
}
}
}
@@ -725,7 +726,7 @@
}
/**
- * 璁㈠崟璺熻釜鍑嗙‘鐜�(杩斿埄鍒哥敤鎴疯鍗�/娣樺疂鑱旂洘璁㈠崟)
+ * 璁㈠崟璺熻釜鍑嗙‘鐜�(鏉挎牀蹇渷鐢ㄦ埛璁㈠崟/娣樺疂鑱旂洘璁㈠崟)
*
* @param callback
* @param dateType
@@ -736,7 +737,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;
@@ -772,7 +773,7 @@
JSONArray line_list = new JSONArray();
List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
- endTime);
+ endTime, sourceType);
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
--
Gitblit v1.8.0