From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 499 ++++++++++++++++++++++++++++++------------------------
1 files changed, 276 insertions(+), 223 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 26bc9ed..3ef6f94 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
@@ -15,6 +15,12 @@
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.controller.admin.utils.AdminUtils;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+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.taobao.TaoBaoWeiQuanDrawBack;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.TaoBaoOrderCountService;
@@ -22,6 +28,9 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
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.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -37,25 +46,33 @@
@Resource
private OrderService orderService;
-
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
@Resource
private CommonOrderService commonOrderService;
-
+
@Resource
private TaoBaoOrderService taoBaoOrderService;
-
+
@Resource
private TaoBaoOrderCountService taoBaoOrderCountService;
-
+ @Resource
+ private TaoBaoWeiQuanDrawBackService taoBaoWeiQuanDrawBackService;
+
+ @Resource
+ private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
/**
* 缁熻鍘嗗彶璁㈠崟-娣樺疂璁㈠崟
+ *
* @param callback
* @param request
* @param out
@@ -68,7 +85,7 @@
JSONObject data = new JSONObject();
data.put("typeOrder", countByOdrerType);
-
+
// 缁熻浠婃棩 鏈け鏁堣鍗曟暟閲� 鐩稿悓璁㈠崟鍙峰悎骞朵负涓�鍗�
int todayOrder = taoBaoOrderCountService.countToday();
// 缁熻鏄ㄦ棩 鏈け鏁堣鍗曟暟閲� 鐩稿悓璁㈠崟鍙峰悎骞朵负涓�鍗�
@@ -76,10 +93,10 @@
data.put("todayOrder", todayOrder);
data.put("yesterdayOrder", yesterdayOrder);
-
+
data.put("genzong", yesterdayOrder);
data.put("yesterdayOrder", yesterdayOrder);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -87,10 +104,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏌ヨ鎵�鏈夌敤鎴疯鍗曞垪琛�
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -104,15 +121,13 @@
* @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, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
-
+
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
@@ -123,7 +138,7 @@
if (type != null && type == 0) {
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
-
+
if (endTime != null && endTime.trim().length() > 0) {
endTime += " 23:59:59";
}
@@ -132,15 +147,65 @@
long count = 0;
// 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize,
- keyType, key, state, type, orderState, startTime, endTime);
-
+ 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);
}
-
+
+ // 鏌ヨ鏄惁缁存潈
+ for (CommonOrderVO order : list) {
+ // 鏌ヨ鏄惁缁存潈
+ TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());
+ if (weiQuanOrder != null)// 鏈夌淮鏉�
+ {
+ order.setState(CommonOrder.STATE_WQ);
+ TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService
+ .selectByOrderItemId(weiQuanOrder.getOrderItemId());
+ if (drawBack != null) {// 宸茬粡閫�娆�
+ order.setWeiQuanState(weiQuanOrder.getState());
+ // 璁＄畻閫�娆捐祫閲�
+ UserMoneyDetail detail = null;
+ switch (order.getHongBaoType()) {
+ case HongBaoV2.TYPE_ZIGOU:
+ detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
+ UserMoneyDetailTypeEnum.fanliWeiQuan, Long.parseLong(order.getUserId()),
+ drawBack.getId());
+ if (detail == null)
+ detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
+ UserMoneyDetailTypeEnum.weiQuan, Long.parseLong(order.getUserId()),
+ drawBack.getId());
+ break;
+ case HongBaoV2.TYPE_YIJI:
+ case HongBaoV2.TYPE_ERJI:
+ case HongBaoV2.TYPE_SHARE_YIJI:
+ case HongBaoV2.TYPE_SHARE_ERJI:
+ detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
+ UserMoneyDetailTypeEnum.inviteWeiQuan, Long.parseLong(order.getUserId()),
+ drawBack.getId());
+ break;
+
+ case HongBaoV2.TYPE_SHARE_GOODS:
+ detail = userMoneyDetailService.selectByTypeAndUidAndIdentifyCode(
+ UserMoneyDetailTypeEnum.shareWeiQuan, Long.parseLong(order.getUserId()),
+ drawBack.getId());
+ break;
+ }
+ if (detail != null) {
+ // 閫�娆炬垚鍔�
+ order.setWeiQuanBackMoney(detail.getMoney().abs().toString());
+ } else {// 灏氭湭閫�娆�
+ order.setWeiQuanBackMoney("-" + order.getHongBao());
+ }
+
+ } else {// 灏氭湭閫�娆�
+ order.setWeiQuanBackMoney("-" + order.getHongBao());
+ }
+ }
+ }
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -158,10 +223,9 @@
}
}
-
-
/**
* 鏌ヨ璁㈠崟鍒楄〃鐢ㄦ埛uid
+ *
* @param callback
* @param pageIndex
* @param pageSize
@@ -175,8 +239,8 @@
* @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) {
+ 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) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("uid涓嶈兘涓虹┖"));
@@ -186,7 +250,7 @@
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
-
+
if (pageSize == null)
pageSize = Constant.PAGE_SIZE;
@@ -197,7 +261,7 @@
if (type != null && type == 0) {
type = null; // 鎵�鏈夌被鍨嬭鍗�
}
-
+
if (endTime != null && endTime.trim().length() > 0) {
endTime += " 23:59:59";
}
@@ -206,15 +270,15 @@
long count = 0;
// 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.listQueryByUid((pageIndex - 1) * pageSize, pageSize ,
- uid, state, type, orderState, orderNo, startTime, endTime, null);
+ List<CommonOrderVO> list = commonOrderService.listQueryByUid((pageIndex - 1) * pageSize, pageSize, uid,
+ state, type, orderState, orderNo, startTime, endTime, null);
if (list != null && list.size() > 0) {
// 缁熻鎬绘暟
- count = commonOrderService.countQueryByUid(uid, state, type, orderState, orderNo, startTime,
- endTime, null);
+ count = commonOrderService.countQueryByUid(uid, state, type, orderState, orderNo, startTime, endTime,
+ null);
}
-
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -251,25 +315,25 @@
* @param out
*/
@RequestMapping(value = "get24HOderChannelCharts")
- public void get24HOderChannelCharts(String callback, String channelArray, Integer dateType,
- String year, String startTime, String endTime, PrintWriter out) {
+ public void get24HOderChannelCharts(String callback, String channelArray, Integer dateType, 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));
return;
}
-
+
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
endTime = null;
}
-
List<String> channelList = null;
if (channelArray != null && channelArray.trim().length() > 0) {
Gson gson = new Gson();
- channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+ channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+ }.getType());
}
if (channelList == null || channelList.size() == 0) {
@@ -277,27 +341,26 @@
channelList.add("all");
}
-
if (dateType == 1 && year != null) {
year = null; // 璁剧疆涓虹┖
} else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
+ 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;
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
}
-
+
try {
Gson gson = new Gson();
@@ -305,15 +368,15 @@
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
JSONArray line_list = new JSONArray();
-
- for (String channel : channelList) {
- List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year, startTime, endTime);
-
+ for (String channel : channelList) {
+ List<Map<String, Object>> list = hongBaoV2CountService.count24HOderByChannel(channel, dateType, year,
+ startTime, endTime);
+
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
}
-
+
JSONObject innerList = new JSONObject();
innerList.put("name", channel);
@@ -328,10 +391,9 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
+
line_list.add(innerList);
}
-
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -339,32 +401,35 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
+
data.put("line_list", line_list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
/**
* 缁熻鎻愮幇鐢宠鎬绘鏁�
+ *
* @param callback
- * @param channelArray 娓犻亾鍚� 涓虹┖鏄粺璁℃墍鏈�
- * @param dateType 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
- * @param state 鐘舵�侊細 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
- * @param year
+ * @param channelArray
+ * 娓犻亾鍚� 涓虹┖鏄粺璁℃墍鏈�
+ * @param dateType
+ * 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
+ * @param state
+ * 鐘舵�侊細 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
+ * @param year
* @param startTime
* @param endTime
* @param out
*/
@RequestMapping(value = "getHongBaoNum")
- public void getHongBaoNum(String callback,String channelArray, Integer dateType, Integer state,
- String year, String startTime, String endTime, PrintWriter out) {
+ public void getHongBaoNum(String callback, String channelArray, Integer dateType, Integer state, String year,
+ String startTime, String endTime, PrintWriter out) {
String validateMsg = AdminUtils.validateParams(dateType, startTime, endTime);
if (validateMsg != null) {
@@ -373,7 +438,7 @@
}
try {
- JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 1);
+ JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 1);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
@@ -383,28 +448,32 @@
/**
* 缁熻鎻愮幇鐢宠鎬婚噾棰�
+ *
* @param callback
- * @param channelArray 娓犻亾鍚� 涓虹┖鏄粺璁℃墍鏈�
- * @param dateType 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
- * @param state 鐘舵�侊細 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
- * @param year
+ * @param channelArray
+ * 娓犻亾鍚� 涓虹┖鏄粺璁℃墍鏈�
+ * @param dateType
+ * 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
+ * @param state
+ * 鐘舵�侊細 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
+ * @param year
* @param startTime
* @param endTime
* @param out
*/
@RequestMapping(value = "getHongBaoMoney")
- public void getHongBaoMoney(String callback,String channelArray, Integer dateType, Integer state,
- String year, String startTime, String endTime, PrintWriter out) {
+ public void getHongBaoMoney(String callback, String channelArray, Integer dateType, Integer state, 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));
return;
}
-
+
try {
-
- JSONObject data = countHistoryHongBao(channelArray, dateType, state, year, startTime, endTime, 2);
+
+ 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("绯荤粺寮傚父"));
@@ -412,15 +481,9 @@
}
}
-
-
-
-
-
-
-
/**
* 缁熻绾㈠寘淇℃伅
+ *
* @param channelArray
* @param dateType
* @param state
@@ -430,19 +493,19 @@
* @return
* @throws Exception
*/
- public JSONObject countHistoryHongBao(String channelArray, Integer dateType, Integer state, String year, String startTime,
- String endTime, int countType) throws Exception {
+ 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;
}
-
List<String> channelList = null;
if (channelArray != null && channelArray.trim().length() > 0) {
Gson gson = new Gson();
- channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {}.getType());
+ channelList = gson.fromJson(channelArray, new TypeToken<ArrayList<String>>() {
+ }.getType());
}
if (channelList == null || channelList.size() == 0) {
@@ -450,46 +513,43 @@
channelList.add("all");
}
-
if (dateType == 1 && year != null) {
year = null; // 璁剧疆涓虹┖
} else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
+ 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;
+ 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);
-
+
JSONArray line_list = new JSONArray();
for (String channel : channelList) {
List<Map<String, Object>> list = null;
- if (countType == 1 ) {
- list = hongBaoV2CountService.countHongBaoNum(channel, dateType, state, year,
- startTime, endTime);
+ if (countType == 1) {
+ list = hongBaoV2CountService.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
} else if (countType == 2) {
- list = hongBaoV2CountService.countHongBaoMoney(channel, dateType, state, year,
- startTime, endTime);
+ list = hongBaoV2CountService.countHongBaoMoney(channel, dateType, state, year, startTime, endTime);
}
-
+
if ("all".equalsIgnoreCase(channel)) {
channel = "鎬昏";
}
-
+
JSONObject innerList = new JSONObject();
innerList.put("name", channel);
@@ -504,10 +564,9 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
+
line_list.add(innerList);
}
-
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -515,43 +574,45 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
+
data.put("line_list", line_list);
-
+
return data;
}
-
/**
- * 鍒嗙被鍨嬭鍗曟暟涓庢瘮渚�
+ * 鍒嗙被鍨嬭鍗曟暟涓庢瘮渚�
+ *
* @param callback
- * @param dateType 鏃� -1 鏈�-2 骞�-3
- * @param type 杩斿埄璁㈠崟-1 鍒嗕韩璁㈠崟-2 閭�璇疯鍗�-3
+ * @param dateType
+ * 鏃� -1 鏈�-2 骞�-3
+ * @param type
+ * 杩斿埄璁㈠崟-1 鍒嗕韩璁㈠崟-2 閭�璇疯鍗�-3
* @param year
* @param startTime
* @param endTime
* @param out
*/
@RequestMapping(value = "getTypeNumber")
- public void getTypeNumber(String callback, Integer dateType, String typeArray, String year,
- String startTime, String endTime, PrintWriter out) {
-
+ 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));
return;
}
-
+
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());
+ channelList = gson.fromJson(typeArray, new TypeToken<ArrayList<Integer>>() {
+ }.getType());
}
if (channelList == null || channelList.size() == 0) {
@@ -559,41 +620,38 @@
return;
}
-
if (dateType == 1 && year != null) {
year = null; // 璁剧疆涓虹┖
} else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
+ 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;
+ 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 {
-
JSONArray line_list = new JSONArray();
for (Integer type : channelList) {
-
- List<Map<String, Object>> list = hongBaoV2CountService.countHongBaoType(dateType,
- type, year, startTime, endTime);
-
-
+
+ List<Map<String, Object>> list = hongBaoV2CountService.countHongBaoType(dateType, type, year, startTime,
+ endTime);
+
JSONObject innerList = new JSONObject();
if (type == 1) {
innerList.put("name", "杩斿埄璁㈠崟");
@@ -614,10 +672,9 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
+
line_list.add(innerList);
}
-
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -625,9 +682,9 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
+
data.put("line_list", line_list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -635,9 +692,10 @@
e.printStackTrace();
}
}
-
+
/**
* 璁㈠崟璺熻釜鍑嗙‘鐜�(杩斿埄鍒哥敤鎴疯鍗�/娣樺疂鑱旂洘璁㈠崟)
+ *
* @param callback
* @param dateType
* @param year
@@ -646,9 +704,8 @@
* @param out
*/
@RequestMapping(value = "getTrackAccuracyRate")
- public void getTrackAccuracyRate(String callback, Integer dateType, String year,
- String startTime, String endTime, PrintWriter out) {
-
+ public void getTrackAccuracyRate(String callback, Integer dateType, String year, String startTime, String endTime,
+ PrintWriter out) {
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
@@ -658,34 +715,34 @@
if (dateType == 1 && year != null) {
year = null; // 璁剧疆涓虹┖
} else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
+ 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;
+ year = null;
+
+ if (startTime != null)
+ startTime = null;
+
+ if (endTime != null)
+ endTime = null;
}
-
+
try {
-
+
Gson gson = new Gson();
Object objectDate = null;
List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);
-
+
JSONArray line_list = new JSONArray();
-
- List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType,
- year, startTime, endTime);
-
+
+ List<Map<String, Object>> list = commonOrderCountService.getTrackAccuracyRate(dateType, year, startTime,
+ endTime);
+
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
@@ -700,9 +757,8 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
- line_list.add(innerList);
+ line_list.add(innerList);
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -710,7 +766,7 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
+
data.put("line_list", line_list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -719,18 +775,19 @@
e.printStackTrace();
}
}
-
-
+
/**
* 褰撳墠鏈敹璐ц鍗曟暟
+ *
* @param callback
- * @param type 璁㈠崟鐘舵��-鏆傛湭浣跨敤
+ * @param type
+ * 璁㈠崟鐘舵��-鏆傛湭浣跨敤
* @param out
*/
@RequestMapping(value = "getHistoryUnreceived")
public void getHistoryUnreceived(String callback, Integer type, PrintWriter out) {
try {
-
+
Long total = commonOrderCountService.countByState(1);
if (total == null) {
total = 0L;
@@ -743,11 +800,10 @@
e.printStackTrace();
}
}
-
-
-
+
/**
* 缁存潈璁㈠崟鏁�
+ *
* @param callback
* @param dateType
* @param year
@@ -756,9 +812,9 @@
* @param out
*/
@RequestMapping(value = "getWeiQaunOrderNumber")
- public void getWeiQaunOrderNumber(String callback, Integer dateType, String year,
- String startTime, String endTime, PrintWriter out) {
-
+ public void getWeiQaunOrderNumber(String callback, Integer dateType, 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));
@@ -766,17 +822,17 @@
}
try {
- JSONObject data = countWeiQaunOrder(dateType, year, startTime, endTime, 1);
+ JSONObject data = countWeiQaunOrder(dateType, year, startTime, endTime, 1);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
e.printStackTrace();
}
}
-
-
+
/**
* 缁存潈璁㈠崟閲戦
+ *
* @param callback
* @param dateType
* @param year
@@ -785,9 +841,9 @@
* @param out
*/
@RequestMapping(value = "getWeiQaunOrderMoney")
- public void getWeiQaunOrderMoney(String callback, Integer dateType, String year,
- String startTime, String endTime, PrintWriter out) {
-
+ public void getWeiQaunOrderMoney(String callback, Integer dateType, 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));
@@ -795,18 +851,17 @@
}
try {
- JSONObject data = countWeiQaunOrder(dateType, year, startTime, endTime, 2);
+ JSONObject data = countWeiQaunOrder(dateType, year, startTime, endTime, 2);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
e.printStackTrace();
}
}
-
-
/**
* 缁熻绾㈠寘淇℃伅
+ *
* @param channelArray
* @param dateType
* @param state
@@ -816,8 +871,8 @@
* @return
* @throws Exception
*/
- public JSONObject countWeiQaunOrder(Integer dateType, String year, String startTime,
- String endTime, int countType) throws Exception {
+ public JSONObject countWeiQaunOrder(Integer dateType, String year, String startTime, String endTime, int countType)
+ throws Exception {
if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
startTime = null;
@@ -827,36 +882,35 @@
if (dateType == 1 && year != null) {
year = null; // 璁剧疆涓虹┖
} else if (dateType == 2) {
- if (startTime != null)
- startTime = null;
-
- if (endTime != null)
- endTime = null;
-
+ 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;
+ 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);
-
+
JSONArray line_list = new JSONArray();
List<Map<String, Object>> list = null;
- if (countType == 1 ) {
+ if (countType == 1) {
list = commonOrderCountService.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
} else if (countType == 2) {
list = commonOrderCountService.countWeiQaunOrderMoney(dateType, year, startTime, endTime);
}
-
-
+
JSONObject innerList = new JSONObject();
innerList.put("name", "鎬昏");
@@ -871,9 +925,8 @@
}
innerList.put("data", gson.toJson(map.get("value")));
}
-
- line_list.add(innerList);
+ line_list.add(innerList);
JSONObject data = new JSONObject();
if (objectDate != null) {
@@ -881,9 +934,9 @@
} else {
data.put("xAxis_list", gson.toJson(dateList));
}
-
+
data.put("line_list", line_list);
-
+
return data;
}
--
Gitblit v1.8.0