From 13fedb841bba848e17c7271e150833d06e08de1d 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: Thu, 5 Sep 2024 15:24:49 +0800 Subject: [PATCH 1/2] =?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/rabbit/PrintMechineConsumer.java | 3 ++- .../system/cashierservice/service/MemberService.java | 4 ++++ src/main/resources/application-dev.yml | 4 +--- src/main/resources/application.yml | 3 ++- src/main/resources/mapper/TbShopUserMapper.xml | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java index 634594f..22de17a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java @@ -19,6 +19,8 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -292,7 +294,6 @@ public class PrintMechineConsumer { log.info("获取当前类别是否未打印类别:{}", count); if (count > 0) { - // 统计已打数量 int printerNum = 0; boolean isReturn = false; 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 c86af5d..8862797 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -88,6 +88,10 @@ public class MemberService { public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) { PageHelperUtil.startPage(page, pageSize); + + if(!"1".equals(isFlag)){ + isFlag=null; + } List tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag); PageInfo pageInfo = new PageInfo(tbShopUsers); return Result.success(CodeEnum.SUCCESS, pageInfo); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8ceb21e..ba41bd9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,9 +12,6 @@ spring: minIdle: 5 maxActive: 20 maxWait: 60000 - logging: - level: - com.chaozhanggui.system.openness: info redis: # redis数据库索引（默认为0），我们使用索引为3的数据库，避免和其他数据库冲突 database: 0 @@ -52,6 +49,7 @@ mybatis: map-underscore-to-camel-case: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mapper-locations: classpath:mapper/*.xml + subscribe: message: miniprogramState: trial diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 61e6df1..7c61761 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,7 +10,8 @@ logging: # web日志 org.springframework.web: debug # mybatis日志 - org.mybatis: debug + mybits: DEBUG + org.apache.ibatis: DEBUG charset: # 输出控制台编码 console: UTF-8 diff --git a/src/main/resources/mapper/TbShopUserMapper.xml b/src/main/resources/mapper/TbShopUserMapper.xml index 0db26c6..d35ed59 100644 --- a/src/main/resources/mapper/TbShopUserMapper.xml +++ b/src/main/resources/mapper/TbShopUserMapper.xml @@ -372,7 +372,7 @@ and telephone like concat("%",#{phone},"%") - + and amount > 0 From d13d16238e31d476b2bc6b269ed9eb141798c7ea 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: Thu, 5 Sep 2024 15:45:12 +0800 Subject: [PATCH 2/2] =?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/rabbit/BalanceConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/BalanceConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/BalanceConsumer.java index 75e5a7d..8532993 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/BalanceConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/BalanceConsumer.java @@ -167,7 +167,7 @@ public class BalanceConsumer { public static String convertDate(Date date){ - SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy年MM月dd号 HH:mm:ss"); + SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss"); return sdf4.format(new Date()); }