From d343b4b39ec34eb78c2d055ff1ffb6b2ced171b7 Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Wed, 17 Sep 2025 00:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseUser/mapper/ZcBaseUserMapper.java | 2 + .../baseUser/service/IZcBaseUserService.java | 2 + .../service/impl/ZcBaseUserServiceImpl.java | 6 + .../controller/ZcOrderMainController.java | 13 +- .../ruoyi/orders/dto/StatisticsHomeOrder.java | 12 ++ .../orders/mapper/ZcOrderMainMapper.java | 13 +- .../orders/service/IZcOrderMainService.java | 12 +- .../service/impl/ZcOrderMainServiceImpl.java | 25 ++-- .../controller/system/SysIndexController.java | 22 +++- .../mapper/baseUser/ZcBaseUserMapper.xml | 4 + .../mapper/orders/ZcOrderMainMapper.xml | 114 +++++++++++------- .../src/main/resources/templates/main.html | 33 ++--- 12 files changed, 175 insertions(+), 83 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseUserMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseUserMapper.java index 9fd1c73..e833815 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseUserMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseUserMapper.java @@ -90,4 +90,6 @@ public interface ZcBaseUserMapper public int deleteZcBaseUserStoreByUserId(Long id); public int deleteZcBaseUserStoreById(Long id); + + public int selectUserCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java index 418c079..e8b6877 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java @@ -64,4 +64,6 @@ public interface IZcBaseUserService public int deleteZcBaseUserById(Long id); public int deleteZcBaseUserStoreById(Long id); + + public int selectUserCount(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java index ff5498f..e9dd44a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java @@ -175,4 +175,10 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService public int deleteZcBaseUserStoreById(Long id) { return zcBaseUserMapper.deleteZcBaseUserStoreById(id); } + + @Override + public int selectUserCount(){ + return zcBaseUserMapper.selectUserCount(); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderMainController.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderMainController.java index 343a7d2..5b2f69d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderMainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderMainController.java @@ -173,14 +173,19 @@ public class ZcOrderMainController extends BaseController @ResponseBody public AjaxResult statisticsHomeOrder(String type) { List list = new ArrayList(); + StatisticsHomeOrder query = new StatisticsHomeOrder(); + // 运营者账号，只能查询所属商户数据 + if(UserConstants.USER_TYPE_02.equals(getSysUser().getUserType())){ + query.setOperatorId(getSysUser().getGroupId()); + } if(type.equals("hour")) { - list = zcOrderMainService.statisticsOrderByHour(); + list = zcOrderMainService.statisticsOrderByHour(query); }else if(type.equals("week")) { - list = zcOrderMainService.statisticsOrderByWeek(); + list = zcOrderMainService.statisticsOrderByWeek(query); }else if(type.equals("month")) { - list = zcOrderMainService.statisticsOrderByMonth(); + list = zcOrderMainService.statisticsOrderByMonth(query); }else if(type.equals("year")) { - list = zcOrderMainService.statisticsOrderByYear(); + list = zcOrderMainService.statisticsOrderByYear(query); } return AjaxResult.success(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/StatisticsHomeOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/StatisticsHomeOrder.java index ba602a9..d01e352 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/StatisticsHomeOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/dto/StatisticsHomeOrder.java @@ -3,6 +3,10 @@ package com.ruoyi.orders.dto; import java.math.BigDecimal; public class StatisticsHomeOrder { + + private Long operatorId; + + private String keyType; private String name; private int totalCount; @@ -75,4 +79,12 @@ public class StatisticsHomeOrder { public void setRentbatteryAmount(BigDecimal rentbatteryAmount) { this.rentbatteryAmount = rentbatteryAmount; } + + public Long getOperatorId() { + return operatorId; + } + + public void setOperatorId(Long operatorId) { + this.operatorId = operatorId; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderMainMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderMainMapper.java index 54a9e61..61d1bf4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderMainMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderMainMapper.java @@ -101,15 +101,18 @@ public interface ZcOrderMainMapper * @param limit 前N条记录 * @return 门店订单统计列表 */ - List selectTopStoreOrderStats(@Param("limit") int limit); + List selectTopStoreOrderStats(@Param("operatorId") Long operatorId, @Param("limit") int limit); int selectOrderCountByCarRuleId(@Param("carRuleId")Long carRuleId); - List statisticsOrderByHour(); + List statisticsOrderByHour(StatisticsHomeOrder query); - List statisticsOrderByWeek(); + List statisticsOrderByWeek(StatisticsHomeOrder query); - List statisticsOrderByMonth(); + List statisticsOrderByMonth(StatisticsHomeOrder query); + + List statisticsOrderByYear(StatisticsHomeOrder query); + + StatisticsHomeOrder statisticsOrderSum(StatisticsHomeOrder query); - List statisticsOrderByYear(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderMainService.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderMainService.java index 37f759c..6ec5f47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderMainService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderMainService.java @@ -71,16 +71,18 @@ public interface IZcOrderMainService * @param limit 前N条记录 * @return 门店订单统计列表 */ - List getTopStoreOrderStats(int limit); + List getTopStoreOrderStats(Long operatorId, int limit); public int selectOrderCountByCarRuleId(Long carRuleId); - public List statisticsOrderByHour(); + public List statisticsOrderByHour(StatisticsHomeOrder query); - public List statisticsOrderByWeek(); + public List statisticsOrderByWeek(StatisticsHomeOrder query); - public List statisticsOrderByMonth(); + public List statisticsOrderByMonth(StatisticsHomeOrder query); - public List statisticsOrderByYear(); + public List statisticsOrderByYear(StatisticsHomeOrder query); + + public StatisticsHomeOrder statisticsOrderSum(StatisticsHomeOrder query); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java index 0030b2b..03f3e6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderMainServiceImpl.java @@ -339,8 +339,8 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService * @return 门店订单统计列表 */ @Override - public List getTopStoreOrderStats(int limit) { - return zcOrderMainMapper.selectTopStoreOrderStats(limit); + public List getTopStoreOrderStats(Long operatorId, int limit) { + return zcOrderMainMapper.selectTopStoreOrderStats(operatorId, limit); } @Override @@ -349,23 +349,28 @@ public class ZcOrderMainServiceImpl implements IZcOrderMainService } @Override - public List statisticsOrderByHour() { - return zcOrderMainMapper.statisticsOrderByHour(); + public List statisticsOrderByHour(StatisticsHomeOrder query) { + return zcOrderMainMapper.statisticsOrderByHour(query); } @Override - public List statisticsOrderByWeek() { - return zcOrderMainMapper.statisticsOrderByWeek(); + public List statisticsOrderByWeek(StatisticsHomeOrder query) { + return zcOrderMainMapper.statisticsOrderByWeek(query); } @Override - public List statisticsOrderByMonth() { - return zcOrderMainMapper.statisticsOrderByMonth(); + public List statisticsOrderByMonth(StatisticsHomeOrder query) { + return zcOrderMainMapper.statisticsOrderByMonth(query); } @Override - public List statisticsOrderByYear() { - return zcOrderMainMapper.statisticsOrderByYear(); + public List statisticsOrderByYear(StatisticsHomeOrder query) { + return zcOrderMainMapper.statisticsOrderByYear(query); + } + + @Override + public StatisticsHomeOrder statisticsOrderSum(StatisticsHomeOrder query) { + return zcOrderMainMapper.statisticsOrderSum(query); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 881fc30..971b2fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -5,6 +5,8 @@ import java.util.List; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.baseUser.service.IZcBaseUserService; +import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.utils.*; import com.ruoyi.orders.dto.StatisticsHomeOrder; import com.ruoyi.orders.dto.StoreOrderStats; @@ -53,6 +55,8 @@ public class SysIndexController extends BaseController private ISysNoticeService noticeService; @Autowired private IZcOrderMainService zcOrderMainService; + @Autowired + private IZcBaseUserService zcBaseUserService; // 系统首页 @GetMapping("/index") @@ -151,13 +155,27 @@ public class SysIndexController extends BaseController // HomeStatisticsVo homeStatisticsVo = idWarningMemberService.selectHomeStatistics(); // mmap.put("homeStatisticsVo", homeStatisticsVo); + StatisticsHomeOrder query = new StatisticsHomeOrder(); + // 运营者账号，只能查询所属商户数据 + Long operatorId = null; + if(UserConstants.USER_TYPE_02.equals(getSysUser().getUserType())){ + query.setOperatorId(getSysUser().getGroupId()); + operatorId = getSysUser().getGroupId(); + } + // 获取门店订单统计数据 - List storeOrderStats = zcOrderMainService.getTopStoreOrderStats(9); + List storeOrderStats = zcOrderMainService.getTopStoreOrderStats(operatorId, 9); mmap.put("storeOrderStats", storeOrderStats); - List statisticsHomeOrders = zcOrderMainService.statisticsOrderByMonth(); + + List statisticsHomeOrders = zcOrderMainService.statisticsOrderByMonth(query); mmap.put("statisticsHomeOrders", statisticsHomeOrders); + StatisticsHomeOrder statisticsSum = zcOrderMainService.statisticsOrderSum(query); + mmap.put("statisticsSum", statisticsSum); + + mmap.put("userCount", zcBaseUserService.selectUserCount()); + List sysNotices = noticeService.selectHomeNoticeList(); mmap.put("sysNotices", sysNotices); diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml index 427eba1..435ef9b 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseUserMapper.xml @@ -185,4 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml index c20ab94..5c26107 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml @@ -290,6 +290,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE a.order_status in ('AUTO_END','MANUAL_END') AND a.del_flag = '0' AND b.del_flag = '0' + + and b.operating_company_id = #{operatorId} + GROUP BY a.store_id ORDER BY orderAmount DESC LIMIT #{limit} @@ -300,65 +303,92 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 75e1efc..e59246a 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -225,6 +225,7 @@ /* 新增样式 */ .box.box-success.box-widget { margin-bottom: 20px; + border-top: 2px solid #4facfe !important; } .box-header p.box-title { @@ -269,6 +270,8 @@ border-top: 0; padding: 10px 10px 10px 10px; } + + @@ -289,9 +292,9 @@

平台订单金额

-

12,560元

-

比上月 ▲ 12%   比上周 ▲ 11%

-

本月日均销售额 ￥12,423

+

元

+ +
@@ -300,10 +303,10 @@
-

租车订单

-

7,000元

-

比上月 ▲ 12%   比上周 ▲ 11%

-

本月日均销售额 ￥12,423

+

租车订单金额

+

元

+ +
@@ -314,10 +317,10 @@
-

租车订单数

-

560

-

比上月 ▲ 30   比上周 ▲ 20

-

上月订单数 423

+

租电订单金额

+

元

+ +
@@ -326,10 +329,10 @@
-

租车平台新增用户数

-

560

-

本月新增 ▲ 100   七天新增 ▲ 80

-

租车+电池租车总用户 62,423

+

平台用户数

+

+ +