From 3fc84b5d4b36ce9ab5cea84ee1b54942c8e04ef9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 08 八月 2019 16:55:52 +0800
Subject: [PATCH] 拼多多短链修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 ecdd9c6..10c654d 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
@@ -139,8 +139,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, 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;
@@ -162,16 +163,12 @@
}
try {
- long count = 0;
-
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime);
+ state, type, orderState, startTime, endTime, sourceType);
- 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);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
@@ -734,7 +731,7 @@
* @param out
*/
@RequestMapping(value = "getTrackAccuracyRate")
- public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,
+ 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))) {
@@ -771,7 +768,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