1

ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java

@@ -302,18 +302,17 @@ public class EntryCommandServiceImpl implements EntryCommandService {
                         incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.入账.getValue());
                     }
                     if(entryBillAggregate.getVoucherState().getValue().equals(VoucherStateEnum.已入账.getValue())){
-                        voucherAggregate.setVoucherState(VoucherStateApplyEnum.已入账.getValue());
                         incomeAggregate.getReceiptBillVo().setIncomeSpeed(IncomeSpeedEnum.完成.getValue());
+                        //4 更新入账过程表
+                        entryBillAggregate = new EntryBillAggregate(
+                                entryBillAggregate.getEntryBillId(),incomeId,null,null,
+                                VoucherStateEnum.getByValue(VoucherStateEnum.已入账.getValue())
+                                ,null
+                        );
                     }
                     incomeRepository.save(incomeAggregate);
-                    //4 更新入账过程表
-                    entryBillAggregate = new EntryBillAggregate(
-                            entryBillAggregate.getEntryBillId(),incomeId,null,null,
-                            VoucherStateEnum.getByValue(VoucherStateEnum.已入账.getValue())
-                            ,null
-                    );
                     entryBillRepository.save(entryBillAggregate);
-
+                    voucherAggregate.setVoucherState(VoucherStateApplyEnum.已入账.getValue());
                 }else{
                     voucherAggregate.setRejectReason(cmd.getRejectReason());
                     voucherAggregate.setVoucherState(VoucherStateApplyEnum.驳回.getValue());