补充控货订单查询参数放货锁定收货人到期时间和订单限制修改收货人状态

Signed-off-by: zhengyi <landuo321@aliyun.com>

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

@@ -252,6 +252,20 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "自定义付款人信息")
     private String customDrawee;
 
+    @ApiModelProperty(value = "是否限制修改收货人")
+    private Boolean isLimitUpdateConsignee;
+
+    @ApiModelProperty(value = "开始放货锁定收货人到期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date beginLockConsigneeTime;
+
+
+    @ApiModelProperty(value = "结束放货锁定收货人到期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date endLockConsigneeTime;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "开始送货时间")

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml

@@ -2029,6 +2029,12 @@
         <if test="query.beginTakeTime != null and query.endTakeTime != null ">
             AND o.`status` > 19 AND o.`take_time` between #{query.beginTakeTime} and #{query.endTakeTime}
         </if>
+        <if test="query.isLimitUpdateConsignee != null">
+            AND o.`is_limit_update_consignee` = #{query.isLimitUpdateConsignee,jdbcType=BOOLEAN}
+        </if>
+        <if test="query.beginLockConsigneeTime != null and query.endLockConsigneeTime != null ">
+            AND o.`lock_consignee_time` between #{query.beginLockConsigneeTime} and #{query.endLockConsigneeTime}
+        </if>
         <if test="query.beginSplitTime != null and query.endSplitTime != null ">
             AND o.`split_time` between #{query.beginSplitTime} and #{query.endSplitTime}
         </if>
@@ -2372,6 +2378,12 @@
         <if test="query.containerNumber != null and query.containerNumber != '' ">
             AND o.`container_number` = #{query.containerNumber}
         </if>
+        <if test="query.isLimitUpdateConsignee != null">
+            AND o.`is_limit_update_consignee` = #{query.isLimitUpdateConsignee,jdbcType=BOOLEAN}
+        </if>
+        <if test="query.beginLockConsigneeTime != null and query.endLockConsigneeTime != null ">
+            AND o.`lock_consignee_time` between #{query.beginLockConsigneeTime} and #{query.endLockConsigneeTime}
+        </if>
         <if test="query.beginRucangTime != null and query.endRucangTime != null ">
             AND o.order_id in(select distinct wi.order_id from ecw_order_warehouse_in wi where wi.deleted = 0 and
             wi.`in_time` between #{query.beginRucangTime} and #{query.endRucangTime})
@@ -3437,6 +3449,12 @@
         <if test="query.customerId != null">
             AND o.`customer_id` = #{query.customerId}
         </if>
+        <if test="query.isLimitUpdateConsignee != null">
+            AND o.`is_limit_update_consignee` = #{query.isLimitUpdateConsignee,jdbcType=BOOLEAN}
+        </if>
+        <if test="query.beginLockConsigneeTime != null and query.endLockConsigneeTime != null ">
+            AND o.`lock_consignee_time` between #{query.beginLockConsigneeTime} and #{query.endLockConsigneeTime}
+        </if>
         <if test="query.beginRucangTime != null and query.endRucangTime != null ">
             AND o.order_id in(select distinct wi.order_id from ecw_order_warehouse_in wi where wi.deleted = 0 and
             wi.`in_time` between #{query.beginRucangTime} and #{query.endRucangTime})
@@ -3758,6 +3776,12 @@
         <if test="query.beginTakeTime != null and query.endTakeTime != null ">
             AND o.`status` > 19 AND o.`take_time` between #{query.beginTakeTime} and #{query.endTakeTime}
         </if>
+        <if test="query.isLimitUpdateConsignee != null">
+            AND o.`is_limit_update_consignee` = #{query.isLimitUpdateConsignee,jdbcType=BOOLEAN}
+        </if>
+        <if test="query.beginLockConsigneeTime != null and query.endLockConsigneeTime != null ">
+            AND o.`lock_consignee_time` between #{query.beginLockConsigneeTime} and #{query.endLockConsigneeTime}
+        </if>
         <if test="query.beginSplitTime != null and query.endSplitTime != null ">
             AND o.`split_time` between #{query.beginSplitTime} and #{query.endSplitTime}
         </if>
@@ -3935,6 +3959,12 @@
         <if test="query.beginTakeTime != null and query.endTakeTime != null ">
             AND o.`status` > 19 AND o.`take_time` between #{query.beginTakeTime} and #{query.endTakeTime}
         </if>
+        <if test="query.isLimitUpdateConsignee != null">
+            AND o.`is_limit_update_consignee` = #{query.isLimitUpdateConsignee,jdbcType=BOOLEAN}
+        </if>
+        <if test="query.beginLockConsigneeTime != null and query.endLockConsigneeTime != null ">
+            AND o.`lock_consignee_time` between #{query.beginLockConsigneeTime} and #{query.endLockConsigneeTime}
+        </if>
         <if test="query.beginSplitTime != null and query.endSplitTime != null ">
             AND o.`split_time` between #{query.beginSplitTime} and #{query.endSplitTime}
         </if>