From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 202 +++++++++++++++++++++++++++++++------------------
1 files changed, 127 insertions(+), 75 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 54bd45d..0c1ad6a 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,7 +30,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
@Controller
@RequestMapping("admin/new/api/v1/order")
@@ -68,9 +67,8 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
- * 娣樺疂璁㈠崟
+ * 鏌ヨ鎵�鏈夌敤鎴疯鍗曞垪琛�
* @param callback
* @param pageIndex
* @param pageSize
@@ -83,16 +81,25 @@
* @param endTime
* @param out
*/
- @RequestMapping(value = "getTBOrder")
- public void getTBOrder(String callback, Integer pageIndex, Integer keyType,
- String key, Integer state, String startTime, String endTime, PrintWriter 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) {
+
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
+ if (pageSize == null)
+ pageSize = Constant.PAGE_SIZE;
+
if (state != null && state == 0) {
state = null;// 鎵�鏈夌姸鎬�
+ }
+
+ if (type != null && type == 0) {
+ type = null; // 鎵�鏈夌被鍨嬭鍗�
}
if (endTime != null && endTime.trim().length() > 0) {
@@ -100,46 +107,24 @@
}
try {
-
long count = 0;
- int pageSize = Constant.PAGE_SIZE;
- List<TaoBaoOrderVO> listVO = null;
-
- if (key != null && key.trim().length() > 0 && keyType == 2) {
-
- // 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.listQueryByUid((pageIndex - 1) * pageSize, pageSize ,
- Long.parseLong(key), state, null, null, null, startTime, endTime, null);
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- // 缁熻鎬绘暟
- count = commonOrderService.countQueryByUid(Long.parseLong(key), state, null, null, null, startTime, endTime, null);
-
- } else {
-
- List<TaoBaoOrderVO> listQuery = taoBaoOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, startTime, endTime, state);
-
- if (listQuery == null || listQuery.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- count= taoBaoOrderService.countQuery(key, startTime, endTime, state);
-
- }
-
+ // 鏌ヨ鍒楄〃
+ List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize,
+ keyType, key, state, type, orderState, startTime, endTime);
+
+
+ if (list != null && list.size() > 0) {
+ // 缁熻鎬绘暟
+ count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+ }
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
JSONObject data = new JSONObject();
data.put("pe", pe);
- data.put("result_list", listVO);
+ data.put("result_list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -150,9 +135,23 @@
e.printStackTrace();
}
}
-
-
+
+
+ /**
+ * 鏌ヨ璁㈠崟鍒楄〃鐢ㄦ埛uid
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param orderNo
+ * @param startTime
+ * @param endTime
+ * @param out
+ */
@RequestMapping(value = "getHistoryOrder")
public void getHistoryOrder(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, PrintWriter out) {
@@ -229,8 +228,8 @@
* 2018-12-01
* @param out
*/
- @RequestMapping(value = "getOderChannelCharts")
- public void getOderChannelCharts(String callback, String channelArray, Integer dateType, Integer type,
+ @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);
@@ -284,14 +283,10 @@
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
JSONArray line_list = new JSONArray();
+
for (String channel : channelList) {
- List<Map<String, Object>> list = null;
- if (type == 1) {
- list = hongBaoService.count24HOderByChannel(channel, dateType, year, startTime, endTime);
+ List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year, startTime, endTime);
- } else if (type == 2) {
- list = hongBaoService.countHistoryOderByChannel(channel, dateType, year, startTime, endTime);
- }
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
@@ -301,7 +296,7 @@
innerList.put("name", channel);
if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
// 骞磋鍥�
Map<String, Object> map = AdminUtils.yearsDataFactory(list);
@@ -387,7 +382,7 @@
try {
- JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 1);
+ JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 2);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
@@ -477,7 +472,7 @@
innerList.put("name", channel);
if (dateType != 3) {
- innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateList, list)));
+ innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
} else {
// 骞磋鍥�
Map<String, Object> map = AdminUtils.yearsDataFactory(list);
@@ -515,44 +510,101 @@
* @param endTime
* @param out
*/
- @RequestMapping(value = "getTypeRate")
- public void getTypeRate(String callback, Integer dateType, Integer type, String year,
+ @RequestMapping(value = "getTypeNumber")
+ public void getTypeNumber(String callback, Integer dateType, String typeArray, String year,
String startTime, String endTime, PrintWriter out) {
- if (StringUtil.isNullOrEmpty(startTime) || StringUtil.isNullOrEmpty(endTime)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鏃堕棿鍖洪棿"));
+ String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
+ if (validateMsg != null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
return;
}
- if (type == null || dateType ==null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("瑙嗗浘绫诲瀷銆佽鍗曠被鍨嬩笉鑳戒负绌�"));
+ if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
+ startTime = null;
+ endTime = null;
+ }
+
+
+ List<Integer> channelList = null;
+ if (typeArray != null && typeArray.trim().length() > 0) {
+ Gson gson = new Gson();
+ channelList = gson.fromJson(typeArray, new TypeToken<ArrayList<Integer>>() {}.getType());
+ }
+
+ if (channelList == null || channelList.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璁㈠崟绫诲瀷涓嶈兘涓虹┖"));
return;
}
+
+
+ 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;
+ }
+
+ Gson gson = new Gson();
+ Object objectDate = null;
+ List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
try {
- List<Map<String, Object>> resultList = hongBaoV2CountService.getProportionByType(dateType,
- type, year, startTime, endTime);
- if (resultList == null) {
- resultList = new ArrayList<Map<String, Object>>();
+ JSONArray line_list = new JSONArray();
+ for (Integer type : channelList) {
+
+ List<Map<String, Object>> list = hongBaoV2CountService.countHongBaoType(dateType,
+ type, year, startTime, endTime);
+
+
+ JSONObject innerList = new JSONObject();
+ if (type == 1) {
+ innerList.put("name", "杩斿埄璁㈠崟");
+ } else if (type == 2) {
+ innerList.put("name", "鍒嗕韩璁㈠崟");
+ } else if (type == 3) {
+ 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 innerList = new JSONObject();
- if (type == 1) {
- innerList.put("name", "杩斿埄璁㈠崟");
- } else if (type == 2) {
- innerList.put("name", "鍒嗕韩璁㈠崟");
- } else if (type == 3) {
- innerList.put("name", "閭�璇疯鍗�");
- }
- innerList.put("data_list", resultList);
-
- JSONArray outList = new JSONArray();
- outList.add(innerList);
-
+
JSONObject data = new JSONObject();
- data.put("result_list", outList);
+ 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));
--
Gitblit v1.8.0