调整订单编辑详情

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -183,9 +183,12 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         } else {
             vo.setApplyType(ORDER_UPDATE.getValue());
         }
-//        if (vo.getOrderNo().startsWith("DRAFT")) {
-//            vo.setOrderNo("");
-//        }
+        if (Objects.nonNull(vo.getConsignorVO())) {
+            CustomerDO customerDO = customerService.getCustomer(vo.getConsignorVO().getCustomerId());
+            if (Objects.nonNull(customerDO)) {
+                vo.setNoConsignee(customerDO.getNoConsignee());
+            }
+        }
         return vo;
     }
 

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

@@ -589,6 +589,25 @@ public class OrderBackVO {
     private Boolean isInOpenSea;
 
 
+    @ApiModelProperty(value = "是否有收货人，1-是，0-否")
+    private Boolean hasConsignee = true;
+
+
+    @ApiModelProperty(value = "是否允许无收货人，1-是，0-否")
+    private Boolean noConsignee;
+
+    @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 lockConsigneeTime;
+
+    @ApiModelProperty(value = "放货锁定收货人天数")
+    private Integer lockConsigneeDay;
+
+
     @ApiModelProperty(value = "订单修改是否变动了归属客户，此字段用来判定订单是否需要重置归属客户经理，下单后归属客户的客户经理是固定的，除非订单归属客户变动，才需要重置客户经理")
     @TableField(exist = false)
     private Boolean isChargeCustomer;