From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java
index 65c2e6e..9883b480 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java
@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -55,17 +56,54 @@
*/
void updateOrderStatus(@Param("deliveryId") Long deliveryId, @Param("serviceTime") Date serviceTime, @Param("status") int status);
- IPage<ComShopFlowerOrderStoreListVO> pageOrderByStoreId(@Param("page") Page page,@Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
+ IPage<ComShopFlowerOrderStoreListVO> pageOrderByStoreId(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
/**
* 根据类型统计订单数量
+ *
* @param deliveryType
* @return
*/
- List<ComShopOrderCountVO> selectCountByDeliveryType(@Param("deliveryType") Integer deliveryType,@Param("storeId") Long storeId);
+ List<ComShopOrderCountVO> selectCountByDeliveryType(@Param("deliveryType") Integer deliveryType, @Param("storeId") Long storeId);
- List<ComShopOrderStoreIdCountVO> selectCountByStoreId(@Param("storeId") Long storeId,@Param("deliveryType") Integer deliveryType);
+ List<ComShopOrderStoreIdCountVO> selectCountByStoreId(@Param("storeId") Long storeId, @Param("deliveryType") Integer deliveryType);
List<ComShopOrderStoreIdCountVO> selectSumAmountByStoreId(@Param("storeId") Long storeId);
+
+ /**
+ * 获取商家总营业额
+ *
+ * @param storeId
+ * @return
+ */
+ BigDecimal selectTurnover(@Param("storeId") Long storeId);
+
+ /**
+ * 获取商家可结算额度 15天以前的完成的订单
+ *
+ * @param storeId
+ * @return
+ */
+ BigDecimal selectSettlement(@Param("storeId") Long storeId);
+
+ List<ComShopOrderStoreIdNumVO> selectSumOrderAndAmountByStoreId(@Param("storeId") Long storeId);
+
+ /**
+ * 查询近15天的订单量
+ *
+ * @param storeId
+ * @return
+ */
+ List<ComShopOrderStoreIdCountVO> selectCountOrderDayByStoreId(@Param("storeId") Long storeId, @Param("days") Integer days);
+
+ /**
+ * 查询当年月份的订单量
+ *
+ * @param storeId
+ * @return
+ */
+ List<ComShopOrderStoreIdCountVO> selectCountOrderMonthByStoreId(@Param("storeId") Long storeId);
+
+ IPage<ComShopFlowerOrderStoreListVO> pageOrderByDeliveryNo(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
}
\ No newline at end of file
--
Gitblit v1.7.1