修改枚举值

performance-api/src/main/java/com/clx/performance/enums/OwnerAccountEnum.java

@@ -67,8 +67,8 @@ public enum OwnerAccountEnum {
     @Getter
     @AllArgsConstructor
     public enum OrderChildTypeStatus {
-        ORDINARY(1, "普通单"),
-        NETWORK(2, "网运单"),
+        NETWORK(1, "网运单"),
+        ORDINARY(2, "普通单"),
         ;
         private final Integer code;
         private final String msg;

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

@@ -95,11 +95,15 @@ public class SettlementServiceImpl implements SettlementService {
                 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());
+                    return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
+                            && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
+                            ;
                 }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
 
                 BigDecimal takeOut = runningWaterRecordList.stream().filter(item -> {
-                    return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode());
+                    return item.getRunningWaterType().equals(OwnerAccountEnum.RunningWaterStatus.TAKE_OUT.getCode())
+                            && item.getAccountType().equals(OwnerAccountEnum.AccountTypeStatus.PREPAID_FREIGHT_ACCOUNT.getCode())
+                            ;
                 }).map(OwnerRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
                 BigDecimal subtract = frozen.subtract(takeOut);
                 if (subtract.compareTo(BigDecimal.ZERO) <= 0) {