Merge branch 'release-fix' into dev

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

 package cn.iocoder.yudao.module.order.vo.order;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -578,6 +581,9 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "订单状态详情见字典：order_status")
     private List<Integer> statusList;
 
+    @ApiModelProperty(value = "订单状态详情见字典：order_status")
+    private String statusString;
+
     @ApiModelProperty(value = "订单异常状态(字典 order_abnormal_state)")
     private List<Integer> abnormalStateList;
 
@@ -617,7 +623,19 @@ public class OrderQueryVO {
             }
         }
     }
+    public void setStatusString(String statusString) {
+        if (StringUtils.isNotBlank(statusString)) {
+            this.asStatusList = Arrays.stream(statusString.split(StrUtil.COMMA)).map(Integer::parseInt).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(this.asStatusList)) {
+                this.statusList = new ArrayList<>();
+                for (Integer asStatus : asStatusList) {
+                    combinedStateList(asStatus, this.transportId);
+                }
+            }
+        }
+    }
     public void setStatusList(List<Integer> statusList) {
+        this.statusList = statusList;
         this.asStatusList = statusList;
         if (CollectionUtil.isNotEmpty(this.asStatusList)) {
             this.statusList = new ArrayList<>();