租车订单列表添加筛选条件

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/bg/BgOrderListVo.java

@@ -41,7 +41,8 @@ public class BgOrderListVo {
 	private Integer vehicleCode;
 
 	private Integer userId;
-
+	//押金退还状态
+	private Integer refundStatus;
 	//员工身份
 	private String positionName;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -19,11 +19,11 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
-import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
-import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
@@ -58,7 +58,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -347,6 +346,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         private Integer type;
 
         private String phone;
+        //违章押金退还状态
+        private Integer validStatus;
 
         /**
          * 后台搜索条件：真实姓名

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -258,6 +258,9 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="validStatus != null">
+                and refundStatus = #{status}
+            </if>
             <if test="type != null">
                 and type = #{type}
             </if>