Merge branch 'release-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderCargoControl/OrderCargoControlMapper.java

@@ -84,6 +84,7 @@ public interface OrderCargoControlMapper extends AbstractMapper<OrderCargoContro
             "o.parent_number, ",
             "o.container_number, ",
             "o.marks, ",
+            "o.type, ",
             "o.`status`, ",
             "o.abnormal_state, ",
             "o.in_warehouse_state, ",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dto/OrderCargoControlReleaseInfoDto.java

@@ -33,6 +33,10 @@ public class OrderCargoControlReleaseInfoDto {
     @ApiModelProperty(value = "唛头")
     private String marks;
 
+
+    @ApiModelProperty(value = "增值服务(多个使用','连接)：1 集运服务 2 海外仓")
+    private String type;
+
     @ApiModelProperty(value = "货柜自编号")
     private String containerNumber;
 

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

@@ -615,6 +615,8 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
             OrderCargoControlApplyVO orderCargoControlApplyVO = new OrderCargoControlApplyVO();
             BeanUtils.copyProperties(releaseInfoDto, orderCargoControlApplyVO);
             orderCargoControlApplyVO.setApplyStatus(0);
+            orderCargoControlApplyVO.setOrderType(releaseInfoDto.getType());
+            orderCargoControlApplyVO.setIsOverseasWarehouse(StringUtils.isNotBlank(releaseInfoDto.getType()) && releaseInfoDto.getType().contains("2"));
             return orderCargoControlApplyVO;
         } else {
             OrderCargoControlApplyVO applyVO = JSONObject.parseObject(orderApprovalDO.getDetails(), OrderCargoControlApplyVO.class);

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

@@ -30,6 +30,9 @@ public class OrderCargoControlApplyVO {
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
+    @ApiModelProperty(value = "增值服务(多个使用','连接)：1 集运服务 2 海外仓")
+    private String orderType;
+
     @ApiModelProperty(value = "提单号")
     private String tidanNo;