客户整合仓库

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;
+
 }

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;
 	/**
 	 * 保费率
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml

@@ -18,6 +18,7 @@
         <where>
             lbss.is_deleted = 0
             <if test="param.shopId != null and param.shopId != null"> and lbs.store_name like concat('%',#{param.shopId},'%')  </if>
+            <if test="param.shopIds != null and param.shopIds != null"> and lbss.shop_id = #{param.shopIds}  </if>
             <if test="param.forwardingUnit != null and param.forwardingUnit != null"> and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') </if>
             <if test="param.warehouseService != null and param.warehouseService != null"> and lbss.warehouse_service like concat('%',#{param.warehouseService},'%')  </if>
         </where>