需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/LetterLogic.java

@@ -324,7 +324,7 @@ public class LetterLogic {
 
         //生成订单流水号
         if (websitNumber.equals("GZ")) {
-            String yyyyMM = DateUtil.format(new Date(), "yyyy");
+      /*
 
             if (redisUtil.get(Constant.RedisPrefix.LETTER_NUMBER + yyyyMM) == null) {
                 redisUtil.set(Constant.RedisPrefix.LETTER_NUMBER + yyyyMM, yyyyMM+"00000", 2726560*13);
@@ -334,21 +334,19 @@ public class LetterLogic {
 
             Long number = Convert.toLong(water) + 1;
             redisUtil.set(Constant.RedisPrefix.LETTER_NUMBER + yyyyMM, number, 2726560*13);
-            return "GZ"+number;
-        }
+            return "GZ"+number;*/
 
-        String yyyyMM = DateUtil.format(new Date(), "yyyy");
+            String yyyyMM = DateUtil.format(new Date(), "yyyy");
+            Integer count = leLetterService.lambdaQuery().eq(LeLetter::getBelongCompany, websitNumber).count();
+            Long number = Convert.toLong(yyyyMM+"00000") + count;
+            return "GZ"+number;
 
-        if (redisUtil.get(Constant.RedisPrefix.LETTER_NUMBER_FS + yyyyMM) == null) {
-            redisUtil.set(Constant.RedisPrefix.LETTER_NUMBER_FS + yyyyMM, yyyyMM+"00000", 2726560*13);
         }
-        Object water = redisUtil.get(Constant.RedisPrefix.LETTER_NUMBER_FS + yyyyMM);
-
 
-        Long number = Convert.toLong(water) + 1;
-        redisUtil.set(Constant.RedisPrefix.LETTER_NUMBER + yyyyMM, number, 2726560*13);
+        String yyyyMM = DateUtil.format(new Date(), "yyyy");
+        Integer count = leLetterService.lambdaQuery().eq(LeLetter::getBelongCompany, websitNumber).count();
+        Long number = Convert.toLong(yyyyMM+"00000") + count;
         return "FS"+number;
-
     }