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

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/impl/CreateCodeServiceImpl.java

@@ -32,7 +32,7 @@ public class CreateCodeServiceImpl implements ICreateCodeService {
     private static final String SEQUENCE_TYPE_UR = "%05d";
     private static final String SEQUENCE_TYPE = "%07d";
     private final RedisTemplate<String, String> redisTemplate;
-    private String rulePrefix;
+    private String rulePrefix = "";
 
     public CreateCodeServiceImpl(RedisTemplate<String, String> redisTemplate) {
         this.redisTemplate = redisTemplate;
@@ -198,14 +198,14 @@ public class CreateCodeServiceImpl implements ICreateCodeService {
                 String formattedSequence = String.format(sequenceType, currentSequence);
                 log.info("===================>更新《{}》顺序码：{}<===================", sequenceKey, formattedSequence);
                 // 更新顺序码
-                if (sequenceType.equals(LOCK_KEY_DR)) {
+                if (lockKey.equals(LOCK_KEY_DR)) {
                     setValueWithMonthlyExpiration(sequenceKey, String.valueOf(formattedSequence));
                 } else {
                     setValueWithYearlyExpiration(sequenceKey, String.valueOf(formattedSequence));
                 }
 
                 String generatedSequence = sequenceKey + formattedSequence;
-                String result = generatedSequence + (sequenceType.equals(LOCK_KEY_DR) ? "" : rulePrefix);
+                String result = generatedSequence + (lockKey.equals(LOCK_KEY_DR) ? "" : rulePrefix);
 
                 log.info("===================>返回《{}》顺序码：{}<===================", sequenceKey, result);
                 return result;