From f53edec193227af90aad11f557723e72b4860400 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 03 一月 2019 18:18:21 +0800
Subject: [PATCH] 冲突处理
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 56 --------------------------------------------------------
1 files changed, 0 insertions(+), 56 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 604741e..1a5acd7 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
@@ -49,62 +49,6 @@
/**
- * 缁熻褰撳ぉ鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param channel 娓犻亾鍚嶇О 濡傦細VIVO
- * @param out
- */
- @RequestMapping(value = "get24HOderByChannel")
- public void get24HOderByChannel(String callback, Integer pageIndex, Integer pageSize,
- String channelArray, PrintWriter out) {
-
- if (pageIndex == null || pageIndex < 1) {
- pageIndex = 1;
- }
-
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
-
- try {
-
- if (StringUtil.isNullOrEmpty(channelArray)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
- return;
- }
-
- Gson gson = new Gson();
- List<String> list = gson.fromJson(channelArray, new TypeToken<ArrayList<Long>>() {}.getType());
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
- return;
- }
-
-
-// List<Map<String, Object>> list = hongBaoService.count24HOderByChannel((pageIndex - 1) * pageSize, pageSize, channel);
-//
-// if (list == null || list.size() == 0) {
-// JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
-// return;
-// }
-//
-// JSONObject data = new JSONObject();
-// data.put("pe", pe);
-// data.put("result_list", list);
-
-// JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
-
- }
-
- /**
* 缁熻鍘嗗彶娓犻亾浜х敓璁㈠崟鐨勯噾棰�
* @param callback
* @param channelArray 鍚嶅瓧鏁扮粍
--
Gitblit v1.8.0