Revert " 仓库-线路集运服务配置"

This reverts commit fa619d3a.

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseDO.java

@@ -205,42 +205,6 @@ public class WarehouseDO extends BaseDO implements Serializable {
     /*
     是否开通集运服务
     */
-    private Long isConsService;
-
-    /*
-     集运重量上限
-     */
-    @TableField(exist = false)
-    private BigDecimal consWeightLimit;
-    /*
-     集运体积上限
-     */
-    @TableField(exist = false)
-    private BigDecimal consVolumeLimit;
-    /*
-    在库时长限制
-    */
-    @TableField(exist = false)
-    private Long stockDurationLimit;
-    /*
-    集运服务费
-     */
-    @TableField(exist = false)
-    private BigDecimal consServiceFee;
-    /*
-    集运服务费币种
-     */
-    @TableField(exist = false)
-    private Long consServiceFeeCurrency;
-    /*
-    集运验货服务费
-     */
-    @TableField(exist = false)
-    private BigDecimal consInspectionFee;
-    /*
-    集运验货服务费币种
-     */
-    @TableField(exist = false)
-    private Long consInspectionFeeCurrency;
+    private String isConsService;
 
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseLineDO.java

@@ -137,33 +137,4 @@ public class WarehouseLineDO extends BaseDO {
     */
     private String tzName;
 
-    /*
-     集运重量上限
-     */
-    private BigDecimal consWeightLimit;
-    /*
-     集运体积上限
-     */
-    private BigDecimal consVolumeLimit;
-    /*
-    在库时长限制
-    */
-    private Long stockDurationLimit;
-    /*
-    集运服务费
-     */
-    private BigDecimal consServiceFee;
-    /*
-    集运服务费币种
-     */
-    private Long consServiceFeeCurrency;
-    /*
-    集运验货服务费
-     */
-    private BigDecimal consInspectionFee;
-    /*
-    集运验货服务费币种
-     */
-    private Long consInspectionFeeCurrency;
-
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java

@@ -280,15 +280,6 @@ public class WarehouseServiceImpl implements WarehouseService {
                     warehouseItem.setLkLeft(lineDO.getLkLeft());
                     warehouseItem.setTzName(lineDO.getTzName());
 
-                    // 集运相关配置
-                    warehouseItem.setConsWeightLimit(lineDO.getConsWeightLimit());
-                    warehouseItem.setConsVolumeLimit(lineDO.getConsVolumeLimit());
-                    warehouseItem.setStockDurationLimit(lineDO.getStockDurationLimit());
-                    warehouseItem.setConsServiceFee(lineDO.getConsServiceFee());
-                    warehouseItem.setConsServiceFeeCurrency(lineDO.getConsServiceFeeCurrency());
-                    warehouseItem.setConsInspectionFee(lineDO.getConsInspectionFee());
-                    warehouseItem.setConsInspectionFeeCurrency(lineDO.getConsInspectionFeeCurrency());
-
                     //end  添加配置
 
                     String recipientInfo = lineDO.getRecipientInfo();
@@ -500,15 +491,6 @@ public class WarehouseServiceImpl implements WarehouseService {
                         .set(StringUtils.isNotEmpty(reqVO.getLkLeft()), WarehouseLineDO::getLkLeft, reqVO.getLkLeft())
                         .set(StringUtils.isNotEmpty(reqVO.getLkRight()), WarehouseLineDO::getLkRight, reqVO.getLkRight())
                         .set(StringUtils.isNotEmpty(reqVO.getTzName()), WarehouseLineDO::getTzName, reqVO.getTzName())
-                        // 集运服务设置项
-                        .set(reqVO.getConsWeightLimit() != null, WarehouseLineDO::getConsWeightLimit, reqVO.getConsWeightLimit())
-                        .set(reqVO.getConsVolumeLimit() != null, WarehouseLineDO::getConsVolumeLimit, reqVO.getConsVolumeLimit())
-                        .set(reqVO.getStockDurationLimit() != null, WarehouseLineDO::getStockDurationLimit, reqVO.getStockDurationLimit())
-                        .set(reqVO.getConsServiceFee() != null, WarehouseLineDO::getConsServiceFee, reqVO.getConsServiceFee())
-                        .set(WarehouseLineDO::getConsServiceFeeCurrency, reqVO.getConsServiceFeeCurrency())
-                        .set(reqVO.getConsInspectionFee() != null, WarehouseLineDO::getConsInspectionFee, reqVO.getConsInspectionFee())
-                        .set(reqVO.getConsInspectionFeeCurrency() != null, WarehouseLineDO::getConsInspectionFeeCurrency, reqVO.getConsInspectionFeeCurrency())
-
 
         );
     }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseLineBindRespVO.java

@@ -85,33 +85,6 @@ public class WarehouseLineBindRespVO extends WarehouseBaseVO {
     */
     private String tzName;
 
-    /*
-     集运重量上限
-     */
-    private BigDecimal consWeightLimit;
-    /*
-     集运体积上限
-     */
-    private BigDecimal consVolumeLimit;
-    /*
-    在库时长限制
-    */
-    private Long stockDurationLimit;
-    /*
-    集运服务费
-     */
-    private BigDecimal consServiceFee;
-    /*
-    集运服务费币种
-     */
-    private Long consServiceFeeCurrency;
-    /*
-    集运验货服务费
-     */
-    private BigDecimal consInspectionFee;
-    /*
-    集运验货服务费币种
-     */
-    private Long consInspectionFeeCurrency;
+
 
 }

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/vo/warehouse/WarehouseLineServiceReqVO.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Data
 @ApiModel("仓库线路 - 开通服务相关请求对象")
 public class WarehouseLineServiceReqVO {
@@ -65,33 +63,4 @@ public class WarehouseLineServiceReqVO {
      图章名称
      */
     private String tzName;
-
-    /*
-     集运重量上限
-     */
-    private BigDecimal consWeightLimit;
-    /*
-     集运体积上限
-     */
-    private BigDecimal consVolumeLimit;
-    /*
-    在库时长限制
-    */
-    private Long stockDurationLimit;
-    /*
-    集运服务费
-     */
-    private BigDecimal consServiceFee;
-    /*
-    集运服务费币种
-     */
-    private Long consServiceFeeCurrency;
-    /*
-    集运验货服务费
-     */
-    private BigDecimal consInspectionFee;
-    /*
-    集运验货服务费币种
-     */
-    private Long consInspectionFeeCurrency;
 }