From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
index b21f2d9..f2b9d6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
+import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -18,7 +18,27 @@
@Mapper
public interface ComShopStoreDAO extends BaseMapper<ComShopStoreDO> {
- @Select("select id,`name`,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail from com_shop_store")
- IPage<ComShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
+ @Select("<script>" +
+ "select id,`name`,store_password,contacts,store_account,classify_id,logo,phone,delivery_type,remark,`status`,sale,sale_volume,store_detail,create_at from com_shop_store c" +
+ " <where>" +
+ "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
+ "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
+ " </if> " +
+ "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != ""'>" +
+ "and c.account = #{pageComShopStoreDTO.account} \n" +
+ " </if> " +
+ "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != ""'>" +
+ "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" +
+ " </if> " +
+ "<if test='pageComShopStoreDTO.deliveryType != null'>" +
+ "and c.delivery_type =#{pageComShopStoreDTO.deliveryType}\n" +
+ " </if> " +
+ "<if test='pageComShopStoreDTO.status != null'>" +
+ "and c.status =#{pageComShopStoreDTO.status} \n" +
+ " </if> " +
+ " </where>" +
+ " order by c.create_at desc"+
+ "</script>")
+ IPage<PageShopStoreVO> pageShopStore(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
}
--
Gitblit v1.7.1