From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopStoreDAO.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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 43d848a..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
@@ -20,9 +20,9 @@
@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" +
+ "sale,sale_volume,store_detail,create_at, store_describe from com_shop_store c" +
" <where>" +
- " and c.delete_status=1 and c.status = 1 " +
+ "c.delete_status=1 and c.status = 1" +
"<if test='pageComShopStoreDTO.contacts != null and pageComShopStoreDTO.contacts.trim() != ""'>" +
"and c.contacts like concat('%',#{pageComShopStoreDTO.contacts},'%') \n" +
" </if> " +
@@ -43,4 +43,40 @@
"</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() != ""'>" +
+ "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);
+
+ @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