From 637a0cf315b9b9779e0cdadd16fdd148de989dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Mon, 2 Sep 2024 10:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/controller/MemberController.java   | 3 ++-
 .../system/cashierservice/dao/TbShopUserMapper.java          | 2 +-
 .../system/cashierservice/service/MemberService.java         | 4 ++--
 .../chaozhanggui/system/cashierservice/util/DateUtils.java   | 2 --
 src/main/resources/mapper/TbShopUserMapper.xml               | 5 +++++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
index 5f1b9c8..05c65ab 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/MemberController.java
@@ -26,10 +26,11 @@ public class MemberController {
                               @RequestHeader("clientType") String clientType,
                               @RequestParam("shopId") String shopId,
                               @RequestParam("phone") String phone,
+                              @RequestParam("isFlag") String isFlag,
                               @RequestParam("page") int page,
                               @RequestParam("pageSize") int pageSize
     ) {
-        return memberService.queryMember(shopId, phone, page, pageSize);
+        return memberService.queryMember(shopId, phone, isFlag,page, pageSize);
     }
 
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
index b1aba71..c6a4d67 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbShopUserMapper.java
@@ -22,7 +22,7 @@ public interface TbShopUserMapper {
 
     int updateByPrimaryKey(TbShopUser record);
 
-    List<TbShopUser> selectByShopId(@Param("shopId") String shopId,@Param("phone") String phone);
+    List<TbShopUser> selectByShopId(@Param("shopId") String shopId,@Param("phone") String phone,@Param("isFlag") String isFlag);
 
 
     List<TbShopUser> selectByShopIdAndPhone(@Param("shopId") String shopId,@Param("phone") String phone);
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
index b648921..1371795 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
@@ -85,10 +85,10 @@ public class MemberService {
     private TbOrderInfoMapper tbOrderInfoMapper;
     private MpShopTableMapper mpShopTableMapper;
 
-    public Result queryMember(String shopId, String phone, int page, int pageSize) {
+    public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) {
 
         PageHelperUtil.startPage(page, pageSize);
-        List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone);
+        List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
         PageInfo pageInfo = new PageInfo(tbShopUsers);
         return Result.success(CodeEnum.SUCCESS, pageInfo);
     }
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java
index 9372465..06a5df1 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/DateUtils.java
@@ -21,8 +21,6 @@ public class DateUtils {
 
     private final static SimpleDateFormat sdfTimesSs = new SimpleDateFormat("yyyyMMddHHmmssSSS");
 
-
-
     private final static SimpleDateFormat sdfday = new SimpleDateFormat("MM-dd HH:mm");
 
 
diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml
index 5944e99..0db26c6 100644
--- a/src/main/resources/mapper/TbShopUserMapper.xml
+++ b/src/main/resources/mapper/TbShopUserMapper.xml
@@ -371,6 +371,11 @@
     <if test="phone != null and phone !='' ">
       and telephone  like concat("%",#{phone},"%")
     </if>
+
+    <if test="isFlag != null and isFlag ='1' ">
+      and amount &gt; 0
+    </if>
+
     order by id desc