common/fire-dto/src/main/java/com/fire/dto/enums/RedisKey.java

@@ -4,6 +4,7 @@ public enum RedisKey {
 
     //系统
     ORDER_ID_INCR("order.id.incr", "自增订单id"),
+    GLOBAL_ID_INCR("global.id.incr", "全局自增id"),
     ORDER_INFO("order.info", "订单详情"),
     CHILD_ORDER_INFO("child.order.info", "子订单详情"),
     CUSTOMER_AMOUNT("{customer.amount}", "客户金额"),

modules/make-order/src/main/java/com/fire/order/service/impl/CacheServiceImpl.java

@@ -87,7 +87,7 @@ public class CacheServiceImpl implements CacheService {
     public void cacheBlacklist() {
         List<BlacklistPhone> phones = blacklistPhoneMapper.queryAll();
         if (CollectionUtils.isNotEmpty(phones)) {
-            DataPool.blackList = phones.stream().collect(Collectors.toMap(BlacklistPhone::getPhoneNo, s -> Optional.ofNullable(s.getNote()).orElse("黑名单"), (k1, k2) -> k2));
+            DataPool.blackList = phones.stream().collect(Collectors.toMap(BlacklistPhone::getPhoneNo, a -> Optional.ofNullable(a.getNote()).orElse("黑名单"), (k1, k2) -> k2));
         }
     }
 
@@ -98,7 +98,7 @@ public class CacheServiceImpl implements CacheService {
     public void cacheVirtualNum() {
         List<VirtualNum> virtualNums = virtualNumMapper.queryAll();
         if (CollectionUtils.isNotEmpty(virtualNums)) {
-            DataPool.virtualMap = virtualNums.stream().collect(Collectors.toMap(VirtualNum::getVirtualNum, VirtualNum::getNote, (k1, k2) -> k2));
+            DataPool.virtualMap = virtualNums.stream().collect(Collectors.toMap(VirtualNum::getVirtualNum, a -> Optional.ofNullable(a.getNote()).orElse("虚拟号段"), (k1, k2) -> k2));
         }
 
     }