From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 92 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 51 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 17da593..a7923f8 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
@@ -1,14 +1,15 @@
package com.panzhihua.service_community.dao;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
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.PageComShopStoreDTO;
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;
-import org.apache.ibatis.annotations.Select;
/**
* @auther lyq
@@ -18,55 +19,39 @@
@Mapper
public interface ComShopStoreDAO extends BaseMapper<ComShopStoreDO> {
- @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>" +
- "c.delete_status=1 and status = 1" +
- "<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.store_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);
+ @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, store_describe from com_shop_store c " + " <where>"
+ + "c.delete_status=1 and c.status = 1 "
+ + "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>"
+ + "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') " + " </if> "
+ + "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != ""'>"
+ + "and c.store_account = #{pageComShopStoreDTO.account} " + " </if> "
+ + "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != ""'>"
+ + "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') " + " </if> "
+ + "<if test='pageComShopStoreDTO.deliveryType != null'>"
+ + "and c.delivery_type =#{pageComShopStoreDTO.deliveryType} " + " </if> "
+ + "<if test='pageComShopStoreDTO.status != null'>" + "and c.status =#{pageComShopStoreDTO.status} "
+ + " </if> " + " </where>" + " order by c.create_at desc" + "</script>")
+ IPage<PageShopStoreVO> 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>" +
- " and c.delete_status=1 " +
- "<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.store_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> pageShopStoreByAdmin(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,store_describe from com_shop_store c" + " <where>"
+ + " and c.delete_status=1 "
+ + "<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.store_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> pageShopStoreByAdmin(Page page,
+ @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
@Select("delete from sys_user where user_id = #{sysUserId}")
void deleteSysUserBySysUserId(@Param("sysUserId") Long sysUserId);
@@ -74,4 +59,9 @@
@Select("delete from sys_role where role_key = #{account}")
void deleteSysRoleByAccount(@Param("account") String account);
+ @Select("select count(user_id) from sys_user where phone=#{phone}")
+ int reasonableUserByPhone(@Param("phone") String phone);
+
+ @Select("select count(user_id) from sys_user where account=#{account} and type=5 ")
+ int reasonableUserByAccount(@Param("account") String account);
}
--
Gitblit v1.7.1