联调仓库参数设置的免租时长和控货订单收货人限制时长

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

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/mysql/warehouse/WarehouseLineMapper.java

@@ -72,6 +72,8 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
             "ew_start_country.title_zh as start_country_title_zh,",
             "ew_start_country.title_en as start_country_title_en,",
             "ew_start.volume as start_volume,",
+            "ew_start.rent_free_days as start_rent_free_days,",
+            "ew_start.lock_recipient_days as start_lock_recipient_days,",
             "ew_start.address_zh as start_address_zh,",
             "ew_start.address_en as start_address_en,",
             "ew_start.head as start_head,",
@@ -85,6 +87,8 @@ public interface WarehouseLineMapper extends BaseMapperX<WarehouseLineDO> {
             "ew_dest_country.title_zh as dest_country_title_zh,",
             "ew_dest_country.title_en as dest_country_title_en,",
             "ew_dest.volume as dest_volume,",
+            "ew_dest.rent_free_days as dest_rent_free_days,",
+            "ew_dest.lock_recipient_days as dest_lock_recipient_days,",
             "ew_dest.address_zh as dest_address_zh,",
             "ew_dest.address_en as dest_address_en,",
             "ew_dest.head as dest_head,",

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dto/LogisticsInfoDto.java

@@ -35,6 +35,12 @@ public class LogisticsInfoDto {
     @ApiModelProperty(value = "始发地仓库容量")
     private String startVolume;
 
+    @ApiModelProperty(value = "始发地仓库免租期")
+    private Integer startRentFreeDays;
+
+    @ApiModelProperty(value = "始发地锁定收货人天数")
+    private Integer startLockRecipientDays;
+
     @ApiModelProperty(value = "始发地仓库仓库地址")
     private String startAddressZh;
 
@@ -73,6 +79,12 @@ public class LogisticsInfoDto {
     @ApiModelProperty(value = "目的地仓库容量")
     private String destVolume;
 
+    @ApiModelProperty(value = "目的地仓库免租期")
+    private Integer destRentFreeDays;
+
+    @ApiModelProperty(value = "目的地锁定收货人天数")
+    private Integer destLockRecipientDays;
+
     @ApiModelProperty(value = "目的地仓库仓库地址")
     private String destAddressZh;
 

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

@@ -1466,20 +1466,19 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     orderTimeDO.setRemarksEn(String.format(orderAirTimeEnum.getRemarksEn(), objective.getTitleEn()));
                 }
                 // TODO 这里更新订单卸柜/到仓时间，同时对控货订单的限制修改收货人锁定到期时间进行更新，当前默认使用14D处理，待仓库业务添加该时间配置在做处理
+
+                LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
+                int lockConsigneeDay = Objects.nonNull(logisticsDestInfoDto) && Objects.nonNull(logisticsDestInfoDto.getDestLockRecipientDays()) ? logisticsDestInfoDto.getDestLockRecipientDays() : 0;
                 Date lockConsigneeTime = null;
                 if (orderDO.getIsCargoControl()) {
                     // TODO 获取卸柜/到仓业务时间的锁定收货人时间当天的结束时间
-                    lockConsigneeTime = DateUtil.endOfDay(DateUtil.offsetDay(businessTime, Objects.isNull(orderDO.getLockConsigneeDay()) ? 14 : orderDO.getLockConsigneeDay()));
+                    lockConsigneeTime = DateUtil.endOfDay(DateUtil.offsetDay(businessTime, lockConsigneeDay));
                 }
                 orderMapper.update(null, new LambdaUpdateWrapper<OrderDO>()
                         .set(OrderDO::getUnloadTime, businessTime)
                         .set(OrderDO::getLockConsigneeTime, lockConsigneeTime)
+                        .set(OrderDO::getLockConsigneeDay, lockConsigneeDay)
                         .eq(OrderDO::getOrderId, orderDO.getOrderId()));
-//                LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
-//                if (Objects.nonNull(logisticsDestInfoDto)) {
-//                    orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
-//                    orderTimeDO.setRemarksEn(String.format(orderAirTimeEnum.getRemarksEn(), logisticsDestInfoDto.getDestTitleEn()));
-//                }
                 break;
             case AIR_UNLOADED_CABINET_DELAY:
                 orderTimeDO.setRemarksZh(String.format(orderAirTimeEnum.getRemarksZh(), reasonZh));
@@ -1608,20 +1607,18 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                     orderTimeDO.setRemarksEn(String.format(orderSeaTimeEnum.getRemarksEn(), objective.getTitleEn()));
                 }
                 // TODO 这里更新订单卸柜/到仓时间，同时对控货订单的限制修改收货人锁定到期时间进行更新，当前默认使用14D处理，待仓库业务添加该时间配置在做处理
+                LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
+                int lockConsigneeDay = Objects.nonNull(logisticsDestInfoDto) && Objects.nonNull(logisticsDestInfoDto.getDestLockRecipientDays()) ? logisticsDestInfoDto.getDestLockRecipientDays() : 0;
                 Date lockConsigneeTime = null;
                 if (orderDO.getIsCargoControl()) {
                     // TODO 获取卸柜/到仓业务时间的锁定收货人时间当天的结束时间
-                    lockConsigneeTime = DateUtil.endOfDay(DateUtil.offsetDay(businessTime, Objects.isNull(orderDO.getLockConsigneeDay()) ? 14 : orderDO.getLockConsigneeDay()));
+                    lockConsigneeTime = DateUtil.endOfDay(DateUtil.offsetDay(businessTime, lockConsigneeDay));
                 }
                 orderMapper.update(null, new LambdaUpdateWrapper<OrderDO>()
                         .set(OrderDO::getUnloadTime, businessTime)
                         .set(OrderDO::getLockConsigneeTime, lockConsigneeTime)
+                        .set(OrderDO::getLockConsigneeDay, lockConsigneeDay)
                         .eq(OrderDO::getOrderId, orderDO.getOrderId()));
-//                LogisticsInfoDto logisticsDestInfoDto = warehouseLineMapper.getStartInfoAndDestInfoByLineId(orderDO.getLineId());
-//                if (Objects.nonNull(logisticsDestInfoDto)) {
-//                    orderTimeDO.setRemarksZh(String.format(orderSeaTimeEnum.getRemarksZh(), logisticsDestInfoDto.getDestTitleZh()));
-//                    orderTimeDO.setRemarksEn(String.format(orderSeaTimeEnum.getRemarksEn(), logisticsDestInfoDto.getDestTitleEn()));
-//                }
                 break;
             case SEA_PICKED_UP:
                 // 提货节点动态的原因参数分别为提货件数和提货剩余件数