Merge remote-tracking branch 'origin/test' into test

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());
 
     }

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;

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<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
         PageInfo pageInfo = new PageInfo(tbShopUsers);
         return Result.success(CodeEnum.SUCCESS, pageInfo);