diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java index 21bb48c..b98e3d1 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminIndexController.java @@ -24,15 +24,15 @@ public class AdminIndexController extends BaseController { @PostMapping("/home") public JSONObject home(HttpServletRequest request){ - String leftDate=request.getParameter("leftDate"); + // String leftDate=request.getParameter("leftDate"); // 拼装查询条件 - Map queryMap = new HashMap<>(); - queryMap.put("leftDate",leftDate); + //Map queryMap = new HashMap<>(); + //queryMap.put("leftDate",leftDate); // queryMap.put("rightDate",rightDate); // queryMap.put("sale_ranking",saleRanking); // queryMap.put("saleRankingDate",saleRankingDate); // // 执行查询操作 - Map result =indexService.getCountSys(queryMap); + Map result =indexService.getCountSys(); // 拼装结果 jsonObject.put("code",200); jsonObject.put("data",result); diff --git a/src/main/java/cn/chjyj/szwh/service/IndexService.java b/src/main/java/cn/chjyj/szwh/service/IndexService.java index d610a71..d2fa0f8 100644 --- a/src/main/java/cn/chjyj/szwh/service/IndexService.java +++ b/src/main/java/cn/chjyj/szwh/service/IndexService.java @@ -11,5 +11,5 @@ public interface IndexService { * @param map 统计查询条件 * @return */ - Map getCountSys(Map map); + Map getCountSys(); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java index 7376db3..7df0931 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/IndexServiceImpl.java @@ -14,20 +14,38 @@ public class IndexServiceImpl implements IndexService { private GoodsMapper goodsMapper; @Override - public Map getCountSys(Map map) { + public Map getCountSys() { // 拼装查询结果 Map result = new HashMap<>(); + Map gmap = new HashMap(); // 统计商品数量 gmap.put("is_deleted",0); int goodsCount= goodsMapper.goodsCount(gmap); gmap.clear(); - + result.put("goods_count",goodsCount); // 待付款数量 - result.put("goods_count",goodsCount); - return null; + + + result.put("awaitpay_count",goodsCount); + result.put("awaitdelivery_count",goodsCount); + result.put("awaitclose_count",goodsCount); + result.put("complete_count",goodsCount); + result.put("close_count",goodsCount); + result.put("deal_money",goodsCount); + result.put("order_money",goodsCount); + result.put("deal_goods_count",goodsCount); + result.put("shelf_count",goodsCount); + result.put("out_count",goodsCount); + result.put("yester_order_count",goodsCount); + result.put("yester_complete_count",goodsCount); + result.put("entrust_ranking",goodsCount); + result.put("entrust_sale_ranking",goodsCount); + result.put("treeMap",goodsCount); + result.put("label",goodsCount); + return result; } }