Merge branch 'release-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java

@@ -611,6 +611,7 @@ public class OrderQueryVO {
     public void setAsStatusList(List<Integer> asStatusList) {
         this.asStatusList = asStatusList;
         if (CollectionUtil.isNotEmpty(this.asStatusList)) {
+            this.statusList = new ArrayList<>();
             for (Integer asStatus : asStatusList) {
                 combinedStateList(asStatus, this.transportId);
             }
@@ -619,6 +620,7 @@ public class OrderQueryVO {
     public void setStatusList(List<Integer> statusList) {
         this.asStatusList = statusList;
         if (CollectionUtil.isNotEmpty(this.asStatusList)) {
+            this.statusList = new ArrayList<>();
             for (Integer asStatus : asStatusList) {
                 combinedStateList(asStatus, this.transportId);
             }
@@ -631,6 +633,7 @@ public class OrderQueryVO {
             combinedState(this.asStatus, this.transportId);
         }
         if (Objects.nonNull(transportId) && CollectionUtil.isNotEmpty(this.asStatusList)) {
+            this.statusList = new ArrayList<>();
             for (Integer asStatus : asStatusList) {
                 combinedStateList(asStatus, this.transportId);
             }
@@ -706,9 +709,6 @@ public class OrderQueryVO {
     private void combinedStateList(Integer asStatus, Integer transportId) {
         switch (asStatus) {
             case 12325:
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.shipmentStateList)){
                     this.shipmentStateList = new ArrayList<>();
                 }
@@ -717,9 +717,6 @@ public class OrderQueryVO {
                 break;
             case 10501:
                 // 空运待出
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.airShipmentList)){
                     this.airShipmentList = new ArrayList<>();
                 }
@@ -737,9 +734,6 @@ public class OrderQueryVO {
                 break;
             case 10502:
                 // 空运可出
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.airShipmentList)){
                     this.airShipmentList = new ArrayList<>();
                 }
@@ -749,9 +743,6 @@ public class OrderQueryVO {
                 break;
             case 10503:
                 // 空运已备货
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.airShipmentList)){
                     this.airShipmentList = new ArrayList<>();
                 }
@@ -761,9 +752,6 @@ public class OrderQueryVO {
                 break;
             case 10504:
                 // 待排单
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.airShipmentList)){
                     this.airShipmentList = new ArrayList<>();
                 }
@@ -787,57 +775,42 @@ public class OrderQueryVO {
                 break;
             case 132411:
                 // 空运已出货
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.shipmentStateList)){
                     this.shipmentStateList = new ArrayList<>();
                 }
                 this.statusList.add(32);
                 this.shipmentStateList.add(411);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 132412:
                 // 空运已出仓
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.shipmentStateList)){
                     this.shipmentStateList = new ArrayList<>();
                 }
                 this.statusList.add(32);
                 this.shipmentStateList.add(412);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 132409:
                 // 空运已理货
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.shipmentStateList)){
                     this.shipmentStateList = new ArrayList<>();
                 }
                 this.statusList.add(32);
                 this.shipmentStateList.add(409);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             case 118428:
                 // 空运已到港
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                }
                 if (Objects.isNull(this.shipmentStateList)){
                     this.shipmentStateList = new ArrayList<>();
                 }
                 this.statusList.add(32);
                 this.shipmentStateList.add(428);
-                this.transportId = 3; // 空运待出查询，只查空运的订单
+//                this.transportId = 3; // 空运待出查询，只查空运的订单
                 break;
             default:
-                if (Objects.isNull(this.statusList)){
-                    this.statusList = new ArrayList<>();
-                    this.statusList.add(asStatus);
-                }
+                this.statusList.add(asStatus);
         }
     }