修改门店服务仓

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java

@@ -77,17 +77,17 @@ public class BasicdataShopEntity extends TenantEntity {
 	 * 门店名称
 	 */
 	@ApiModelProperty(value = "门店名称")
-	private String storeName;
+		private String storeName;
 	/**
 	 * 联系人
 	 */
 	@ApiModelProperty(value = "联系人")
-	private Integer linkman;
+	private String linkman;
 	/**
 	 * 联系电话
 	 */
 	@ApiModelProperty(value = "联系电话")
-	private Integer phone;
+	private String phone;
 	/**
 	 * 省份
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java

@@ -35,5 +35,46 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataStorageServicesEntity extends TenantEntity {
 
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ApiModelProperty(value = "门店ID")
+	private Long shopId;
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	private String forwardingUnit;
+	/**
+	 * 服务仓库
+	 */
+	@ApiModelProperty(value = "服务仓库")
+	private String warehouseService;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java

@@ -32,4 +32,7 @@ import lombok.EqualsAndHashCode;
 public class BasicdataStorageServicesVO extends BasicdataStorageServicesEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String storeName;
+
+	private String linkman;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java

@@ -32,4 +32,5 @@ import lombok.EqualsAndHashCode;
 public class BasicdataStoreContactVO extends BasicdataStoreContactEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String storeName;
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java

@@ -147,7 +147,7 @@ public class BasicdataShopController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataShop")
 	public R submit(@Valid @RequestBody BasicdataShopEntity basicdataShop) {
-		return R.status(basicdataShopService.saveOrUpdate(basicdataShop));
+		return R.status(basicdataShopService.saveSubmit(basicdataShop));
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java

@@ -69,13 +69,13 @@ public class BasicdataStorageServicesController extends BladeController {
 		return R.data(detail);
 	}
 	/**
-	 * 门店服务仓库表 分页
+	 * 门店服务仓库表 分页自定义
 	 */
-	@GetMapping("/list")
+	@GetMapping("/pageList")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataStorageServices")
-	public R<IPage<BasicdataStorageServicesEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStorageServices, Query query) {
-		IPage<BasicdataStorageServicesEntity> pages = basicdataStorageServicesService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStorageServices, BasicdataStorageServicesEntity.class));
+	public R<List<BasicdataStorageServicesVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataStorageServices, Query query) {
+		List<BasicdataStorageServicesVO> pages = basicdataStorageServicesService.pageList(Condition.getPage(query), basicdataStorageServices);
 		return R.data(pages);
 	}
 
@@ -117,7 +117,8 @@ public class BasicdataStorageServicesController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataStorageServices")
 	public R submit(@Valid @RequestBody BasicdataStorageServicesEntity basicdataStorageServices) {
-		return R.status(basicdataStorageServicesService.saveOrUpdate(basicdataStorageServices));
+
+		return R.status(basicdataStorageServicesService.submitSave(basicdataStorageServices));
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStoreBrandController.java

@@ -117,7 +117,7 @@ public class BasicdataStoreBrandController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataStoreBrand")
 	public R submit(@Valid @RequestBody BasicdataStoreBrandEntity basicdataStoreBrand) {
-		return R.status(basicdataStoreBrandService.saveOrUpdate(basicdataStoreBrand));
+		return R.status(basicdataStoreBrandService.submitSave(basicdataStoreBrand));
 	}
 
 	/**

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

@@ -40,7 +40,7 @@ public interface BasicdataStorageServicesMapper extends BaseMapper<BasicdataStor
 	 * @param basicdataStorageServices
 	 * @return
 	 */
-	List<BasicdataStorageServicesVO> selectBasicdataStorageServicesPage(IPage page, BasicdataStorageServicesVO basicdataStorageServices);
+	List<BasicdataStorageServicesVO> selectBasicdataStorageServicesPage(IPage page, @Param("param") BasicdataStorageServicesVO basicdataStorageServices);
 
 
 	/**
@@ -50,5 +50,4 @@ public interface BasicdataStorageServicesMapper extends BaseMapper<BasicdataStor
 	 * @return
 	 */
 	List<BasicdataStorageServicesExcel> exportBasicdataStorageServices(@Param("ew") Wrapper<BasicdataStorageServicesEntity> queryWrapper);
-
 }

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

@@ -7,8 +7,20 @@
     </resultMap>
 
 
-    <select id="selectBasicdataStorageServicesPage" resultMap="basicdataStorageServicesResultMap">
-        select * from logpm_basicdata_storage_services where is_deleted = 0
+
+    <select id="selectBasicdataStorageServicesPage" resultType="com.logpm.basicdata.vo.BasicdataStorageServicesVO">
+
+        select lbss.tenant_id, lbss.create_user, lbss.create_time, lbss.update_user, lbss.update_time, lbss.status, lbss.is_deleted, lbss.create_dept, lbss.id, lbss.reserve1, lbss.reserve2,
+               lbss.reserve3, lbss.reserve4, lbss.reserve5, lbss.shop_id, lbss.forwarding_unit, lbss.warehouse_service,lbs.store_name storeName,lbsc.linkman
+        from logpm_basicdata_storage_services lbss
+                 LEFT JOIN logpm_basicdata_shop lbs on lbs.id = lbss.shop_id
+                 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>
+        </where>
     </select>
 
 

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

@@ -7,8 +7,11 @@
     </resultMap>
 
 
-    <select id="selectBasicdataStoreContactPage" resultMap="basicdataStoreContactResultMap">
-        select * from logpm_basicdata_store_contact where is_deleted = 0
+    <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
+        where lbsc.is_deleted = 0
     </select>
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataShopService.java

@@ -51,4 +51,6 @@ public interface IBasicdataShopService extends BaseService<BasicdataShopEntity>
 	List<BasicdataShopExcel> exportBasicdataShop(Wrapper<BasicdataShopEntity> queryWrapper);
 
     IPage<BasicdataShopVO> taglibPage(IPage<Object> page, Map<String, Object> basicdataShop);
+
+    Boolean saveSubmit(BasicdataShopEntity basicdataShop);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java

@@ -23,6 +23,7 @@ import com.logpm.basicdata.excel.BasicdataStorageServicesExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 门店服务仓库表 服务类
@@ -49,4 +50,7 @@ public interface IBasicdataStorageServicesService extends BaseService<BasicdataS
 	 */
 	List<BasicdataStorageServicesExcel> exportBasicdataStorageServices(Wrapper<BasicdataStorageServicesEntity> queryWrapper);
 
+	boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices);
+
+	List<BasicdataStorageServicesVO> pageList(IPage<Object> page, Map<String, Object> basicdataStorageServices);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStoreBrandService.java

@@ -49,4 +49,5 @@ public interface IBasicdataStoreBrandService extends BaseService<BasicdataStoreB
 	 */
 	List<BasicdataStoreBrandExcel> exportBasicdataStoreBrand(Wrapper<BasicdataStoreBrandEntity> queryWrapper);
 
+    Boolean submitSave(BasicdataStoreBrandEntity basicdataStoreBrand);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java

@@ -18,6 +18,7 @@ package com.logpm.basicdata.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.dto.BasicdataShopDTO;
 import com.logpm.basicdata.entity.BasicdataShopEntity;
 import com.logpm.basicdata.vo.BasicdataShopVO;
@@ -64,4 +65,17 @@ public class BasicdataShopServiceImpl extends BaseServiceImpl<BasicdataShopMappe
 		return baseMapper.taglibPage(page,basicdataShopEntity);
 	}
 
+	@Override
+	public Boolean saveSubmit(BasicdataShopEntity basicdataShop) {
+		List<BasicdataShopEntity> basicdataShopEntities = baseMapper.selectList(Wrappers.<BasicdataShopEntity>query().lambda()
+			.eq(BasicdataShopEntity::getClientId, basicdataShop.getClientId())
+			.eq(BasicdataShopEntity::getStoreCode, basicdataShop.getStoreCode())
+			.eq(BasicdataShopEntity::getStoreName, basicdataShop.getStoreName())
+		);
+		if(basicdataShopEntities.size() > 0 ){
+			throw new RuntimeException("客户已绑定此门店！");
+		}
+		return this.saveOrUpdate(basicdataShop);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java

@@ -16,16 +16,20 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
 import com.logpm.basicdata.vo.BasicdataStorageServicesVO;
 import com.logpm.basicdata.excel.BasicdataStorageServicesExcel;
 import com.logpm.basicdata.mapper.BasicdataStorageServicesMapper;
 import com.logpm.basicdata.service.IBasicdataStorageServicesService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 门店服务仓库表 服务实现类
@@ -51,4 +55,26 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 		return basicdataStorageServicesList;
 	}
 
+	@Override
+	public boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices) {
+
+		List<BasicdataStorageServicesEntity> basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.<BasicdataStorageServicesEntity>query().lambda().
+			eq(BasicdataStorageServicesEntity::getShopId, basicdataStorageServices.getShopId()).
+			eq(BasicdataStorageServicesEntity::getForwardingUnit, basicdataStorageServices.getForwardingUnit()).
+			eq(BasicdataStorageServicesEntity::getWarehouseService, basicdataStorageServices.getWarehouseService())
+		);
+		if(basicdataStorageServicesEntities.size() > 0){
+			throw new RuntimeException("存在重复数据！已拒绝！！");
+		}
+		return this.saveOrUpdate(basicdataStorageServices);
+	}
+
+	@Override
+	public List<BasicdataStorageServicesVO> pageList(IPage<Object> page, Map<String, Object> basicdataStorageServices) {
+		BasicdataStorageServicesEntity basicdataStorageServicesEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataStorageServices), BasicdataStorageServicesEntity.class);
+		BasicdataStorageServicesVO basicdataStorageServicesvo = new BasicdataStorageServicesVO() ;
+		BeanUtils.copyProperties(basicdataStorageServicesEntity,basicdataStorageServicesvo);
+		return baseMapper.selectBasicdataStorageServicesPage(page,basicdataStorageServicesvo);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStoreBrandServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataStoreBrandEntity;
 import com.logpm.basicdata.vo.BasicdataStoreBrandVO;
 import com.logpm.basicdata.excel.BasicdataStoreBrandExcel;
@@ -51,4 +52,17 @@ public class BasicdataStoreBrandServiceImpl extends BaseServiceImpl<BasicdataSto
 		return basicdataStoreBrandList;
 	}
 
+	@Override
+	public Boolean submitSave(BasicdataStoreBrandEntity basicdataStoreBrand) {
+
+		List<BasicdataStoreBrandEntity> basicdataStoreBrandEntities = baseMapper.selectList(Wrappers.<BasicdataStoreBrandEntity>query().lambda()
+			.eq(BasicdataStoreBrandEntity::getShopId, basicdataStoreBrand.getShopId())
+			.eq(BasicdataStoreBrandEntity::getBrandId, basicdataStoreBrand.getBrandId())
+		);
+		if(basicdataStoreBrandEntities.size() > 0){
+			throw new RuntimeException("当前门店已拥有该品牌！");
+		}
+		return this.saveOrUpdate(basicdataStoreBrand);
+	}
+
 }