From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 e839fcb..361e333 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
@@ -1,15 +1,69 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO;
+import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderStoreListVO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderCountVO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderSearchVO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
/**
- * @ClassName: ComShopFlowerOrderMapper
+ * @ClassName: ComShopFlowerOrderMapper
* @Author: yh
* @Date: 2022/11/9 16:46
* @Description: TODO
*/
@Mapper
public interface ComShopFlowerOrderDAO extends BaseMapper<ComShopFlowerOrderDO> {
+
+
+ IPage<ComShopFlowerOrderPageVO> pageOrderList(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
+
+
+ IPage<ComShopFlowerOrderPageVO> pageOrderListNoDelivery(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
+
+
+ IPage<ComShopOrderSearchVO> pageOrderBy(@Param("page") Page page,
+ @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+
+ /**
+ * 修改配送中状态
+ *
+ * @param orderIds
+ * @param deliveryId
+ * @param status
+ * @param deliveryTime
+ */
+ void updateOrder(@Param("orderIds") List<Long> orderIds,
+ @Param("deliveryId") Long deliveryId,
+ @Param("deliveryNo") String deliveryNo,
+ @Param("status") int status,
+ @Param("deliveryTime") Date deliveryTime);
+
+ /**
+ * 自提送达后修改配送状态和时间
+ *
+ * @param deliveryId
+ * @param serviceTime
+ * @param status
+ */
+ 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);
+
+ /**
+ * 根据类型统计订单数量
+ * @param deliveryType
+ * @return
+ */
+ List<ComShopOrderCountVO> selectCountByDeliveryType(@Param("deliveryType") Integer deliveryType);
}
\ No newline at end of file
--
Gitblit v1.7.1