Merge branch 'order-update' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlService.java

@@ -162,5 +162,5 @@ public interface OrderCargoControlService extends IService<OrderCargoControlDO>
      *
      * @param orderCargoControlApplyVO 控货订单审批业务申请信息
      */
-    void orderCargoControlPickApply(OrderCargoControlApplyVO orderCargoControlApplyVO);
+    void orderCargoControlApply(OrderCargoControlApplyVO orderCargoControlApplyVO);
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -547,7 +547,7 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
     }
 
     @Override
-    public void orderCargoControlPickApply(OrderCargoControlApplyVO orderCargoControlApplyVO) {
+    public void orderCargoControlApply(OrderCargoControlApplyVO orderCargoControlApplyVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         Integer userType = loginUser != null ? loginUser.getUserType() : null;
         Long userId = loginUser != null ? loginUser.getId() : null;

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>

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderCargoControl/OrderCargoControlController.java

@@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoCon
 import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderSendSmsReqVO;
+import cn.iocoder.yudao.module.order.vo.orderCargoControlPick.OrderCargoControlPickApplyVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -143,13 +144,27 @@ public class OrderCargoControlController {
         return success(true);
     }
 
+    @PutMapping("/update/apply")
+    @ApiOperation("控货业务审批申请")
+    public CommonResult<Boolean> orderCargoControlApply(@Valid @RequestBody OrderCargoControlApplyVO orderCargoControlApplyVO) {
+        orderCargoControlService.orderCargoControlApply(orderCargoControlApplyVO);
+        return success(true);
+    }
+
+    @GetMapping("limit-update/info/{orderId}")
+    @ApiOperation("根据订单ID查询控货订单放货限制修改审核详情")
+    @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, example = "1024", dataType = "Long")
+    public CommonResult<OrderCargoControlApplyVO> approvalLimitUpdateOrderCargoControlByOrderId(@PathVariable(value = "orderId") Long orderId) {
+        OrderCargoControlApplyVO applyVO = orderCargoControlService.approvalOrderCargoControlPickLimitUpdateByOrderId(orderId);
+        return success(applyVO);
+    }
+
     @GetMapping("cancel/approval/{orderApprovalId}")
     @ApiOperation("根据审批id取消审批")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderApprovalId", value = "审批ID", required = true, example = "1024", dataType = "Long"),
             @ApiImplicitParam(name = "reason", value = "取消原因", required = true, example = "1024", dataType = "String")
     })
-    @Deprecated
     public CommonResult<Boolean> cancelApprovalByOrderApprovalId(@PathVariable(value = "orderApprovalId") Long orderApprovalId,
                                                                  @RequestParam(value = "reason") String reason) {
         orderCargoControlPickService.cancelApprovalByOrderApprovalId(orderApprovalId, reason);