From 97e0f871b828f0db3511572fd81e24fb244e126e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 30 May 2023 18:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/basicdata/vo/BasicdataStoreBrandVO.java    |  6 ++++++
 .../com/logpm/basicdata/vo/BasicdataZonePriceVO.java |  2 ++
 .../com/logpm/basicdata/BasicDataApplication.java    |  2 +-
 .../controller/BasicdataStoreBrandController.java    | 10 ++++++++++
 .../controller/BasicdataZonePriceController.java     |  7 +++++--
 .../logpm/basicdata/dto/BasicdataZonePriceDTO.java   |  4 ++++
 .../logpm/basicdata/mapper/BasicdataShopMapper.xml   |  3 +--
 .../mapper/BasicdataStorageServicesMapper.xml        |  6 +++---
 .../basicdata/mapper/BasicdataStoreBrandMapper.java  |  1 +
 .../basicdata/mapper/BasicdataStoreBrandMapper.xml   | 10 +++++++++-
 .../basicdata/mapper/BasicdataStoreContactMapper.xml |  3 ++-
 .../service/IBasicdataStoreBrandService.java         |  2 ++
 .../service/IBasicdataZonePriceService.java          |  3 +++
 .../service/impl/BasicdataStoreBrandServiceImpl.java |  5 +++++
 .../service/impl/BasicdataZonePriceServiceImpl.java  | 12 ++++++++++--
 15 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java
index c3f7f362c..079ebd7e5 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreBrandVO.java
@@ -32,4 +32,10 @@ import lombok.EqualsAndHashCode;
 public class BasicdataStoreBrandVO extends BasicdataStoreBrandEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String storeName;
+
+	private String brandName;
+
+	private String storeBrandName;
+
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
index 1786b1f58..054f46071 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
@@ -35,4 +35,6 @@ public class BasicdataZonePriceVO extends BasicdataZonePriceEntity {
 	private String name;
 	private String brandName;
 
+
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
index d0b239072..ac5a16f39 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java
@@ -15,7 +15,7 @@ import org.springblade.core.launch.BladeApplication;
 public class BasicDataApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat("-cyz"), BasicDataApplication.class, args);
 
 	}
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
index 89ec0de3a..cd945740c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java
@@ -78,6 +78,16 @@ public class BasicdataStoreBrandController extends BladeController {
 		IPage<BasicdataStoreBrandEntity> pages = basicdataStoreBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStoreBrand, BasicdataStoreBrandEntity.class));
 		return R.data(pages);
 	}
+	/**
+	 * 门店品牌中间表 分页
+	 */
+	@GetMapping("/listName")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataStoreBrand")
+	public R<List<BasicdataStoreBrandVO>> listName(String name) {
+		List<BasicdataStoreBrandVO> pages = basicdataStoreBrandService.listName(name);
+		return R.data(pages);
+	}
 
 	/**
 	 * 门店品牌中间表 自定义分页
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
index d4501cac9..a8d302578 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.logpm.basicdata.dto.BasicdataZonePriceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -138,8 +139,10 @@ public class BasicdataZonePriceController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataZonePrice")
-	public R submit(@Valid @RequestBody BasicdataZonePriceEntity basicdataZonePrice) {
-		return R.status(basicdataZonePriceService.saveOrUpdate(basicdataZonePrice));
+	public R submit(@Valid @RequestBody BasicdataZonePriceDTO basicdataZonePrice) {
+
+
+		return R.status(basicdataZonePriceService.ownSaveOrUpdate(basicdataZonePrice));
 	}
 
 	/**
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java
index 8849a1342..a24952b33 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java
@@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Map;
+
 /**
  * 区域品牌价格表 数据传输对象实体类
  *
@@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode;
 public class BasicdataZonePriceDTO extends BasicdataZonePriceEntity {
 	private static final long serialVersionUID = 1L;
 
+	private Map<String,String> fei;
+	private Map<String,String> feishi;
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml
index 4e0e90f37..c2696df42 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataShopMapper.xml
@@ -22,6 +22,7 @@
         from logpm_basicdata_shop lbs
         left JOIN logpm_basicdata_client lbc on lbs.client_id = lbc.id
         <where>
+            lbs.is_deleted = 0
             <if test="param.clientId != null and param.clientId != ''"> and lbc.client_name like concat('%',#{param.clientId},'%')</if>
             <if test="param.storeCode != null and param.storeCode != ''">and lbs.store_code like concat('%',#{param.storeCode},'%')</if>
             <if test="param.storeName != null and param.storeName  != ''">and lbs.store_name like concat('%',#{param.storeName},'%')</if>
@@ -30,8 +31,6 @@
             <if test="param.bladeRegionAreaId != null and param.bladeRegionAreaId != ''">and lbs.blade_region_area_id like concat('%',#{param.bladeRegionAreaId},'%')</if>
             <if test="param.checkInTime != null ">and date_format (lbs.check_in_time,'%Y-%m-%d') <![CDATA[ >= ]]> date_format (#{param.checkInTime},'%Y-%m-%d')  </if>
             <if test="param.postSetTime != null ">and date_format (lbs.post_set_time,'%Y-%m-%d') <![CDATA[ <= ]]> date_format (#{param.postSetTime},'%Y-%m-%d')  </if>
-
-
         </where>
     </select>
 
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 c6f3c78f3..0d245238a 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
@@ -17,9 +17,9 @@
                  LEFT JOIN logpm_basicdata_store_contact lbsc on lbsc.id = lbss.forwarding_unit
         <where>
             lbss.is_deleted = 0
-            <if test="param.shopId != null and param.shopId != null"> and lbs.store_name = #{param.shopId} </if>
-            <if test="param.forwardingUnit != null and param.forwardingUnit != null"> and lbsc.linkman = #{param.forwardingUnit} </if>
-            <if test="param.warehouseService != null and param.warehouseService != null"> and lbss.warehouseService = #{param.warehouseService} </if>
+            <if test="param.shopId != null and param.shopId != null"> and lbs.store_name like concat('%',#{param.shopId},'%')  </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>
     </select>
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java
index ed2a93c6a..61d8ce931 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.java
@@ -51,4 +51,5 @@ public interface BasicdataStoreBrandMapper extends BaseMapper<BasicdataStoreBran
 	 */
 	List<BasicdataStoreBrandExcel> exportBasicdataStoreBrand(@Param("ew") Wrapper<BasicdataStoreBrandEntity> queryWrapper);
 
+    List<BasicdataStoreBrandVO> listName(String name);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml
index 5c81ac394..a28a6db73 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreBrandMapper.xml
@@ -5,7 +5,15 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="basicdataStoreBrandResultMap" type="com.logpm.basicdata.entity.BasicdataStoreBrandEntity">
     </resultMap>
-
+    <select id="listName" resultType="com.logpm.basicdata.vo.BasicdataStoreBrandVO">
+        select lbsb.tenant_id, lbsb.create_user, lbsb.create_time, lbsb.update_user, lbsb.update_time, lbsb.status, lbsb.is_deleted, lbsb.create_dept, lbsb.id, lbsb.reserve1,
+               lbsb.reserve2,lbsb.reserve3, lbsb.reserve4, lbsb.reserve5, lbsb.shop_id, lbsb.brand_id,lbs.store_name storeName, lbb.brand_name brandName,
+               CONCAT(lbs.store_name,' - ', lbb.brand_name ) AS storeBrandName
+        from logpm_basicdata_store_brand lbsb
+                 LEFT JOIN logpm_basicdata_brand lbb on lbsb.brand_id = lbb.id
+                 LEFT JOIN logpm_basicdata_shop lbs on  lbsb.shop_id = lbs.id
+        WHERE  concat(lbs.store_name,lbb.brand_name) like concat('%',#{name},'%')
+    </select>
 
     <select id="selectBasicdataStoreBrandPage" resultMap="basicdataStoreBrandResultMap">
         select * from logpm_basicdata_store_brand where is_deleted = 0
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.xml
index 597ee314e..90428b88b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStoreContactMapper.xml
@@ -10,7 +10,8 @@
     <select id="selectBasicdataStoreContactPage" resultType="com.logpm.basicdata.vo.BasicdataStoreContactVO">
         select lbsc.tenant_id, lbsc.create_user, lbsc.create_time,lbsc.update_user,lbsc.update_time, lbsc.status, lbsc.is_deleted, lbsc.create_dept, lbsc.id, lbsc.reserve1, lbsc.reserve2,
                lbsc.reserve3, lbsc.reserve4, lbsc.reserve5, lbsc.shop_id, lbsc.linkman, lbsc.phone,lbs.store_name storeName
-        from logpm_basicdata_store_contact lbsc  LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbsc.shop_id
+        from logpm_basicdata_store_contact lbsc
+            LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbsc.shop_id
         where lbsc.is_deleted = 0
     </select>
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java
index 5c43062e0..cf763aaf2 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java
@@ -50,4 +50,6 @@ public interface IBasicdataStoreBrandService extends BaseService<BasicdataStoreB
 	List<BasicdataStoreBrandExcel> exportBasicdataStoreBrand(Wrapper<BasicdataStoreBrandEntity> queryWrapper);
 
     Boolean submitSave(BasicdataStoreBrandEntity basicdataStoreBrand);
+
+	List<BasicdataStoreBrandVO> listName(String name);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
index c3895ee32..7cd47a323 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
@@ -17,6 +17,7 @@
 package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.dto.BasicdataZonePriceDTO;
 import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
 import com.logpm.basicdata.vo.BasicdataZonePriceVO;
 import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
@@ -55,4 +56,6 @@ public interface IBasicdataZonePriceService extends BaseService<BasicdataZonePri
 	BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice);
 
     List<BasicdataZonePriceEntity> pageListName(String name);
+
+    Boolean ownSaveOrUpdate(BasicdataZonePriceDTO basicdataZonePrice);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java
index 10c4f6463..a8e91f52c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java
@@ -65,4 +65,9 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl<BasicdataSto
 		return this.saveOrUpdate(basicdataStoreBrand);
 	}
 
+	@Override
+	public List<BasicdataStoreBrandVO> listName(String name) {
+		return baseMapper.listName(name);
+	}
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
index 3a2b40ce0..25a93ffec 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
@@ -17,8 +17,7 @@
 package com.logpm.basicdata.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.dto.BasicdataZonePriceDTO;
 import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
 import com.logpm.basicdata.vo.BasicdataZonePriceVO;
 import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
@@ -71,4 +70,13 @@ public class BasicdataZonePriceServiceImpl extends BaseServiceImpl<BasicdataZone
 		return baseMapper.pageListName(name);
 	}
 
+	@Override
+	public Boolean ownSaveOrUpdate(BasicdataZonePriceDTO basicdataZonePrice) {
+
+
+
+		return false;
+//		return this.saveOrUpdate(basicdataZonePrice);
+	}
+
 }