From f721ee13dc5f95f607bb25b09f73cae6a7123ed9 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期六, 17 四月 2021 17:56:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
index cc07aec..1f6f16c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -1,15 +1,59 @@
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.PageComOrderListDTO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderPageVO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderVO;
+import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Select;
/**
- * @auther lyq
- * @create 2021-04-14 15:03:01
+ * @auther cedoo
+ * @create 2021-4-17 17:35:51
* @describe 订单表mapper类
*/
@Mapper
public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> {
+ @Select("<script> " +
+ "select order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
+ " where 1=1 and cso.delete_status = 1 and cso.user_id = #{comOrderListDTO.userId}" +
+ "<if test='comOrderListDTO.status != null'>" +
+ " AND cso.status = #{comOrderListDTO.status} " +
+ " </if> " +
+ " order by create_at desc " +
+ " </script>")
+ IPage<ComShopOrderPageVO> pageOrderList(Page page,@Param("comOrderListDTO") PageComOrderListDTO comOrderListDTO);
+
+ @Select("<script> " +
+ "SELECT\n" +
+ "id,\n" +
+ "`name`,\n" +
+ "photo_path,\n" +
+ "phone,\n" +
+ "integral,\n" +
+ "create_at \n" +
+ "FROM\n" +
+ "com_mng_volunteer_mng \n" +
+ " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
+ "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
+ " and name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
+ " </if> " +
+ "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
+ "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
+ " </if> " +
+ " order by integral desc,create_at desc"+
+ "</script>")
+ IPage<ComShopOrderVO> pageOrderBy(PageDTO page, PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+
}
--
Gitblit v1.7.1