diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java index 67c755c16..59514f90a 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import io.swagger.annotations.ApiModel; @@ -66,6 +67,11 @@ public class BasicdataStorageServicesEntity extends TenantEntity { */ @ApiModelProperty(value = "门店ID") private Long shopId; + /** + * 区分类型 + */ + @ApiModelProperty(value = "区分类型") + private Long distinguish; /** * 发货单位 */ @@ -77,4 +83,11 @@ public class BasicdataStorageServicesEntity extends TenantEntity { @ApiModelProperty(value = "服务仓库") private String warehouseService; + /** + * 门店ID + */ + @ApiModelProperty(value = "门店ID") + @TableField(exist = false) + private String shopIds; + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataSupportValueEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataSupportValueEntity.java index b5cf7fe5a..7427992f2 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataSupportValueEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataSupportValueEntity.java @@ -41,6 +41,11 @@ public class BasicdataSupportValueEntity extends TenantEntity { */ @ApiModelProperty(value = "收货用户名称") private String userName; + /** + * 价格区间 + */ + @ApiModelProperty(value = "价格区间") + private String priceRange; /** * 保费率 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml index 0d245238a..2e2cb8707 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml @@ -18,6 +18,7 @@ lbss.is_deleted = 0 and lbs.store_name like concat('%',#{param.shopId},'%') + and lbss.shop_id = #{param.shopIds} and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') and lbss.warehouse_service like concat('%',#{param.warehouseService},'%')