From b1716ce92a5cf0cbd9f5faf76705a00c13c77a3c Mon Sep 17 00:00:00 2001
From: jiangxiaoming <7548901@qq.com>
Date: Mon, 30 Sep 2024 12:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=A1=8C=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/command/EntryCommandServiceImpl.java          | 2 ++
 .../infrastructure/repository/EntryBillRepositoryImpl.java    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
index 0b7166f1..41320696 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java
@@ -526,6 +526,7 @@ public class EntryCommandServiceImpl implements EntryCommandService {
         batchId = IdUtil.getSnowflakeNextId();
         List<IncomeAggregate> incomeAggregates = incomeRepository.findByIds(longList);
         Map<Long,IncomeAggregate> map = new HashMap<>();
+        int i = 0;
         for(IncomeAggregate incomeAggregate:incomeAggregates) {
             // 2 鍏ヨ处瑙勫垯鐢熸垚鍑瘉
             VoucherAggregate voucherAggregate = voucherUtil.generateVoucher(incomeAggregate, "鍚�", VoucherStateApplyEnum.鐢宠涓�.getValue(),"鏆傚瓨鍏ヨ处");
@@ -541,6 +542,7 @@ public class EntryCommandServiceImpl implements EntryCommandService {
                     null, voucherId
             );
             entity.setBatchId(batchId);
+            entity.setFlowIndex(++i);
             flowEntityList.add(entity);
             entryBillAggregate = new EntryBillAggregate(
                     entryBillAggregate.getEntryBillId(),incomeAggregate.getIncomeId(),null,null,
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/EntryBillRepositoryImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/EntryBillRepositoryImpl.java
index 86021500..25f38043 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/EntryBillRepositoryImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/repository/EntryBillRepositoryImpl.java
@@ -105,7 +105,9 @@ public class EntryBillRepositoryImpl implements EntryBillRepository {
             if(flowPo.getId() == null){
                 flowPo.setEntryId(finalEntryBillPo.getId());
             }
-            flowPo.setFlowIndex(maxFlowIndex.incrementAndGet()); // 鍓嶇疆閫掑
+            if(flowPo.getFlowIndex() == null){
+                flowPo.setFlowIndex(maxFlowIndex.incrementAndGet()); // 鍓嶇疆閫掑
+            }
             return flowPo;
         }).collect(Collectors.toList());
         //杩欓噷鍙仛鏂板鎿嶄綔
-- 
GitLab