From 7e3d4837b8464c32c4c25f40eb01222a8759eeb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 10:57:56 +0800
Subject: [PATCH] 删除PidOrder相关代码
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java
index 06484b1..26f9693 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/DataAdminController.java
@@ -10,17 +10,16 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.admin.HistorySearchAdmin;
import com.yeshi.fanli.entity.admin.ScanHistoryAdmin;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.order.PidOrderService;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -40,34 +39,11 @@
@Resource
private HistorySearchService historySearchService;
- @Resource
- private PidOrderService pidOrderService;
-
private final static int TOPSUM = 100;
private final static String AWEEK = "1";
private final static String HALFMONTH = "2";
private final static String AMONTH = "3";
private final static String THREEMONTH = "4";
-
- @RequestMapping(value = "getdatacount", method = RequestMethod.POST)
- public void getDataCount(PrintWriter out) {
- long startTime = TimeUtil.getNextDay(-1).getTime();
- long endTime = startTime + 86400000;
-
- long orderCount = orderService.getOrderCountByTime(startTime, endTime);
- long shareOrderCount = pidOrderService.getPidOrderNormalCount(new Date(startTime), new Date(endTime));
- long userCount = userInfoService.getUserCount();
- long historyCount = scanHistoryService.getScanHistory(startTime, endTime);
- List<ScanHistoryAdmin> scanHisoryList = scanHistoryService.getTop(startTime, endTime, TOPSUM);
-
- JSONObject data = new JSONObject();
- data.put("orderCount", orderCount);
- data.put("shareOrderCount", shareOrderCount);
- data.put("userCount", userCount);
- data.put("historyCount", historyCount);
- data.put("scanHisoryList", scanHisoryList);
- out.write(JsonUtil.loadTrueResult(data));
- }
@RequestMapping(value = "getGoodsBrowseList", method = RequestMethod.POST)
public void getGoodsBrowseList(String type, PrintWriter out) {
--
Gitblit v1.8.0