放货限制修改申请参数补充更新

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

@@ -499,13 +499,13 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);
             if (orderApprovalDO.getType() == 61) {
                 // 修改放货限制
-                Integer lockConsigneeDay = applyVO.getIsLimitUpdateConsignee() ? applyVO.getLockConsigneeDay() : null;
+                Integer newLockConsigneeDay = applyVO.getNewIsLimitUpdateConsignee() ? applyVO.getNewLockConsigneeDay() : null;
                 OrderDO orderDO = orderService.getById(applyVO.getOrderId());
-                Date lockConsigneeTime = Objects.isNull(orderDO.getUnloadTime()) || Objects.isNull(lockConsigneeDay) ? null : DateUtil.endOfDay(DateUtil.offsetDay(orderDO.getUnloadTime(), lockConsigneeDay));;
+                Date newLockConsigneeTime = Objects.isNull(orderDO.getUnloadTime()) || Objects.isNull(newLockConsigneeDay) ? null : DateUtil.endOfDay(DateUtil.offsetDay(orderDO.getUnloadTime(), newLockConsigneeDay));;
                 orderService.update(new LambdaUpdateWrapper<OrderDO>()
-                        .set(OrderDO::getIsLimitUpdateConsignee, applyVO.getIsLimitUpdateConsignee())
-                        .set(OrderDO::getLockConsigneeDay, lockConsigneeDay)
-                        .set(OrderDO::getLockConsigneeTime, lockConsigneeTime)
+                        .set(OrderDO::getIsLimitUpdateConsignee, applyVO.getNewIsLimitUpdateConsignee())
+                        .set(OrderDO::getLockConsigneeDay, newLockConsigneeDay)
+                        .set(OrderDO::getLockConsigneeTime, newLockConsigneeTime)
                         .eq(OrderDO::getOrderId, orderApprovalDO.getOrderId()));
                 // TODO 补充订单日志
             }

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

 package cn.iocoder.yudao.module.order.vo.orderCargoControl;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Data
 @ApiModel(value = "订单控货相关审核信息")
@@ -71,10 +76,17 @@ public class OrderCargoControlApplyVO {
     @ApiModelProperty(value = "放货锁定收货人天数")
     private Integer lockConsigneeDay;
 
-//    @ApiModelProperty(value = "放货锁定收货人到期时间")
-//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-//    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-//    private Date lockConsigneeTime;
+    @ApiModelProperty(value = "放货锁定收货人到期时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date lockConsigneeTime;
+
+
+    @ApiModelProperty(value = "新的是否限制修改收货人")
+    private Boolean newIsLimitUpdateConsignee;
+
+    @ApiModelProperty(value = "新的放货锁定收货人天数")
+    private Integer newLockConsigneeDay;
 
 
     @ApiModelProperty(value = "附件")