From c80b367fdd2b776487335557799320e0f8cee85c Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 2 Jan 2025 11:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/screen/ScreenController.java | 8 +++---- .../mysql/orderdetail/OrderDetailMapper.java | 3 ++- .../StoreOrderDetailMapper.java | 21 ++++++++++++++----- .../orderdetail/OrderDetailService.java | 2 +- .../orderdetail/OrderDetailServiceImpl.java | 4 ++-- .../StoreOrderDetailService.java | 2 +- .../StoreOrderDetailServiceImpl.java | 4 ++-- .../mapper/orderdetail/OrderDetailMapper.xml | 9 ++++++++ 8 files changed, 37 insertions(+), 16 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/ScreenController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/ScreenController.java index 6e0ebb4f..88a3cfca 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/ScreenController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/screen/ScreenController.java @@ -203,8 +203,8 @@ public class ScreenController { @GetMapping("/selectDishSale") @Operation(summary = "菜品销量") @PermitAll - public CommonResult> selectDishSale(Long storeId,String startTime,String endTime) { - return success(orderDetailService.selectDishSale(storeId,startTime,endTime)); + public CommonResult> selectDishSale(Long storeId,String startTime,String endTime,Integer type) { + return success(orderDetailService.selectDishSale(storeId,startTime,endTime,type)); } @GetMapping("/storeTurnover") @@ -225,7 +225,7 @@ public class ScreenController { @GetMapping("/selectGoodsSale") @Operation(summary = "商品销量") @PermitAll - public CommonResult> selectGoodsSale(Long storeId,String startTime,String endTime) { - return success(storeOrderDetailService.selectGoodsSale(storeId,startTime,endTime)); + public CommonResult> selectGoodsSale(Long storeId,String startTime,String endTime,Integer type) { + return success(storeOrderDetailService.selectGoodsSale(storeId,startTime,endTime,type)); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/orderdetail/OrderDetailMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/orderdetail/OrderDetailMapper.java index 9d966a1f..9968ba8f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/orderdetail/OrderDetailMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/orderdetail/OrderDetailMapper.java @@ -31,6 +31,7 @@ public interface OrderDetailMapper extends BaseMapperX { .orderByDesc(OrderDetailDO::getId)); } - List selectDishSale(@Param("storeId") Long storeId, @Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime); + List selectDishSale(@Param("storeId") Long storeId, @Param("startTime") LocalDateTime startTime + ,@Param("endTime") LocalDateTime endTime,@Param("type")Integer type); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storeorderdetail/StoreOrderDetailMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storeorderdetail/StoreOrderDetailMapper.java index f13d2bbb..24a84c87 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storeorderdetail/StoreOrderDetailMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storeorderdetail/StoreOrderDetailMapper.java @@ -36,9 +36,20 @@ public interface StoreOrderDetailMapper extends BaseMapperX @Select("select od.custom_price,od.number,od.weight,od.goods_name,sg.img from member_store_order_detail od left join member_store_goods sg on od.goods_id = sg.goods_id where od.order_id = #{orderId}") List selectByOrderId(Integer orderId); - @Select("select od.goods_name,sum(od.number) as `number`,sum(od.number*od.custom_price) as price from member_store_order_detail od\n" + - " left join member_store_order so on od.order_id = so.order_id\n" + - " where so.carteen_id = #{storeId} and od.create_time BETWEEN #{startTime} AND #{endTime}\n" + - " group by od.goods_name") - List selectGoodsSale(@Param("storeId") Long storeId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime); + @Select("") + List selectGoodsSale(@Param("storeId") Long storeId, @Param("startTime") LocalDateTime startTime, @Param("endTime") LocalDateTime endTime, @Param("type") Integer type); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailService.java index 0ce34efc..3f455dcb 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailService.java @@ -60,7 +60,7 @@ public interface OrderDetailService { List selectListByOrderIds(List orderIds); - List selectDishSale(Long storeId, String startTime, String endTime); + List selectDishSale(Long storeId, String startTime, String endTime,Integer type); void insertOne(OrderDetailDO orderDetailDO); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java index 0681a2b8..1e632d94 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java @@ -159,10 +159,10 @@ public class OrderDetailServiceImpl implements OrderDetailService { } @Override - public List selectDishSale(Long storeId, String startTime, String endTime) { + public List selectDishSale(Long storeId, String startTime, String endTime, Integer type) { LocalDateTime start = MemberTimeUtils.string2Time(startTime); LocalDateTime end = MemberTimeUtils.string2Time(endTime); - return orderDetailMapper.selectDishSale(storeId, start, end); + return orderDetailMapper.selectDishSale(storeId, start, end,type); } @Override diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailService.java index dd0e2efc..57ca22ca 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailService.java @@ -64,6 +64,6 @@ public interface StoreOrderDetailService { List getListByOrderId(Integer orderId); - List selectGoodsSale(Long storeId, String startTime, String endTime); + List selectGoodsSale(Long storeId, String startTime, String endTime,Integer type); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailServiceImpl.java index cc42e44a..e5ad1007 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorderdetail/StoreOrderDetailServiceImpl.java @@ -97,9 +97,9 @@ public class StoreOrderDetailServiceImpl implements StoreOrderDetailService { } @Override - public List selectGoodsSale(Long storeId, String startTime, String endTime) { + public List selectGoodsSale(Long storeId, String startTime, String endTime,Integer type) { LocalDateTime start = MemberTimeUtils.string2Time(startTime); LocalDateTime end = MemberTimeUtils.string2Time(endTime); - return storeOrderDetailMapper.selectGoodsSale(storeId, start, end); + return storeOrderDetailMapper.selectGoodsSale(storeId, start, end,type); } } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/orderdetail/OrderDetailMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/orderdetail/OrderDetailMapper.xml index 9fcd3abd..11695649 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/orderdetail/OrderDetailMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/orderdetail/OrderDetailMapper.xml @@ -12,6 +12,15 @@ select od.dishes_name,sum(od.weight) as weight,sum(od.price) as price from member_order_detail od left join member_dish_order mo on od.order_id = mo.id where store_id = #{storeId} and od.create_time between #{startTime} and #{endTime} + + and DATE_FORMAT(od.create_time, '%H:%i:%s') between '00:00:00' and '09:59:59' + + + and DATE_FORMAT(od.create_time, '%H:%i:%s') between '10:00:00' and '15:59:59' + + + and DATE_FORMAT(od.create_time, '%H:%i:%s') between '16:00:00' and '23:59:59' + group by dishes_name