资金流水增加运单号保存

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -79,6 +79,7 @@ public class SettlementServiceImpl implements SettlementService {
         if (settlementOwnerDetail.getInvoiceType() != null) {return;}
         // 开票金额
         settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(),settlementOwnerDetail));
+        invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
         //是否通过风控,调用网络货运
@@ -92,7 +93,6 @@ public class SettlementServiceImpl implements SettlementService {
             BigDecimal ans = settlementOwnerDetail.getFreight().subtract(settlementOwnerDetail.getLossFreight());
             if (status == 1) {
                 //通过风控
-                invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
                 List<OwnerRunningWaterRecord> runningWaterRecordList = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderChild.getOrderNo());
                 BigDecimal frozen = runningWaterRecordList.stream().filter(item -> {
                     return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
@@ -114,7 +114,7 @@ public class SettlementServiceImpl implements SettlementService {
                         OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(orderChild.getOwnerUserNo(),
                                 OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode());
                         settlementOwnerDetail.setPrepayFreight(ans);
-                        invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
+                        invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
 
                         //生成扣除流水
                         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
@@ -144,7 +144,6 @@ public class SettlementServiceImpl implements SettlementService {
 
             } else {
                 settlementDriverDetail.setPrepayFreightFlag(0);
-                invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
                 settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
                 settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
             }