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

# Conflicts:
#	yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -122,9 +122,6 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
         Map<String, String> map = policyBrokerService.queryInternalCodeMap(brokerBizIdList);
         List<FortuneAccount> fortuneAccountList = new ArrayList<>();
         Date currentDate = new Date();
-        String billingYearMonth = actualPayoutDate != null
-                ? actualPayoutDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyyMM"))
-                : "";
 
         Map<String, Integer> prefixSerialCache = new HashMap<>();
 
@@ -133,6 +130,10 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             fortuneAccount.setFortuneAccountBizId(RandomStringGenerator.generateBizId16("fortune_account"));
             String internalCode = map.get(accountExportDTO.getBrokerBizId());
 
+            String billingYearMonth = accountExportDTO.getActualPayoutDate() != null
+                    ? accountExportDTO.getActualPayoutDate().format(java.time.format.DateTimeFormatter.ofPattern("yyyyMM"))
+                    : "";
+
             String prefix = BusinessNoUtils.getPrefix(billingYearMonth, internalCode);
             // 业务编号生成
             String businessNo = generateBusinessNoWithCache(prefix, billingYearMonth, internalCode, prefixSerialCache);