From e75b4aa72e9f260912a96a9bc36b58f9985862b0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:13:15 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.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/ComShopStoreDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java
index f2b9d6a..58b916b 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
@@ -19,13 +19,15 @@
 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" +
+            "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() != &quot;&quot;'>" +
             "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
             " </if> " +
             "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != &quot;&quot;'>" +
-            "and c.account = #{pageComShopStoreDTO.account} \n" +
+            "and c.store_account = #{pageComShopStoreDTO.account} \n" +
             " </if> " +
             "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != &quot;&quot;'>" +
             "and c.`name` like concat('%',#{pageComShopStoreDTO.name},'%') \n" +
@@ -37,8 +39,44 @@
             "and c.status =#{pageComShopStoreDTO.status} \n" +
             " </if> " +
             " </where>" +
-            " order by c.create_at desc"+
+            " 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>" +
+            " and c.delete_status=1 " +
+            "<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != &quot;&quot;'>" +
+            "and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
+            " </if> " +
+            "<if test='pageComShopStoreDTO.account != null and pageComShopStoreDTO.account.trim() != &quot;&quot;'>" +
+            "and c.store_account = #{pageComShopStoreDTO.account} \n" +
+            " </if> " +
+            "<if test='pageComShopStoreDTO.name != null and pageComShopStoreDTO.name.trim() != &quot;&quot;'>" +
+            "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);
+
+    @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