Merge remote-tracking branch 'origin/v9.6_network_small_version_20240102'

performance-web/src/main/java/com/clx/performance/job/OrderChildSyncTransportInvoiceExceptionJob.java

@@ -89,7 +89,11 @@ public class OrderChildSyncTransportInvoiceExceptionJob {
                             SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
 
                 }else if (ObjectUtil.equal(status, 2)){
-                    orderChildPaySync.transportOrderChildProcess(orderChild);
+//                    orderChildPaySync.transportOrderChildProcess(orderChild);
+                    dto.setStatus(2);
+                    bean.setData(dto);
+                    orderChildPaySync.extracted(orderChild, bean, "", settlementOwnerDetail,
+                            SettlementOwnerEnum.InvoiceType.ORDINARY.getCode(), settlementDriverDetail);
                 } else {
                     Object riskReason = json.getByPath("riskReason");
                     OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();

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

@@ -225,7 +225,16 @@ public class NetworkDriverRunningWaterRecordServiceImpl implements NetworkDriver
                     record.setAlterationBalance(record.getAlterationBalance().negate());
                 }
             }
+        } else if (param.getFundType() == null ) {
+            if (CollectionUtil.isNotEmpty(page.getRecords())) {
+                for (APPNetworkDriverRunningWaterRecordVO record : page.getRecords()) {
+                    if (NetworkDriverAccountEnum.RunningWaterStatus.CASE_OUT_SUCCESS.getCode().equals( record.getRunningWaterType())){
+                        record.setAlterationBalance(record.getAlterationBalance().negate());
+                    }
+                }
+            }
         }
+
         return page;
     }