From b1dee965b2da8711d8cf797719434d9f3dcb8c6f Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 29 May 2023 18:09:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/entity/BasicdataShopEntity.java | 6 +-- .../BasicdataStorageServicesEntity.java | 41 +++++++++++++++++++ .../vo/BasicdataStorageServicesVO.java | 3 ++ .../basicdata/vo/BasicdataStoreContactVO.java | 1 + .../controller/BasicdataShopController.java | 2 +- .../BasicdataStorageServicesController.java | 11 ++--- .../BasicdataStoreBrandController.java | 2 +- .../BasicdataStorageServicesMapper.java | 3 +- .../mapper/BasicdataStorageServicesMapper.xml | 16 +++++++- .../mapper/BasicdataStoreContactMapper.xml | 7 +++- .../service/IBasicdataShopService.java | 2 + .../IBasicdataStorageServicesService.java | 4 ++ .../service/IBasicdataStoreBrandService.java | 1 + .../impl/BasicdataShopServiceImpl.java | 14 +++++++ .../BasicdataStorageServicesServiceImpl.java | 26 ++++++++++++ .../impl/BasicdataStoreBrandServiceImpl.java | 14 +++++++ 16 files changed, 137 insertions(+), 16 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java index f848156cb..4ff994b35 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java +++ b/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; /** * 省份 */ 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 c64c82192..67c755c16 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 @@ -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; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java index aede851b0..d783b6436 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStorageServicesVO.java +++ b/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; } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java index 2fe2bcbcc..efaf5b274 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataStoreContactVO.java +++ b/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; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java index d5c228049..e1cd9d1f4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java +++ b/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)); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java index ea81fe0bb..45dafd446 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java +++ b/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> list(@ApiIgnore @RequestParam Map basicdataStorageServices, Query query) { - IPage pages = basicdataStorageServicesService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataStorageServices, BasicdataStorageServicesEntity.class)); + public R> list(@ApiIgnore @RequestParam Map basicdataStorageServices, Query query) { + List 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)); } /** 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 16b1909e8..89ec0de3a 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 @@ -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)); } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java index b55fdf1db..c19520e61 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.java @@ -40,7 +40,7 @@ public interface BasicdataStorageServicesMapper extends BaseMapper selectBasicdataStorageServicesPage(IPage page, BasicdataStorageServicesVO basicdataStorageServices); + List selectBasicdataStorageServicesPage(IPage page, @Param("param") BasicdataStorageServicesVO basicdataStorageServices); /** @@ -50,5 +50,4 @@ public interface BasicdataStorageServicesMapper extends BaseMapper exportBasicdataStorageServices(@Param("ew") Wrapper queryWrapper); - } 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 fdf6e2ce2..c6f3c78f3 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 @@ -7,8 +7,20 @@ - + + 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 + + lbss.is_deleted = 0 + and lbs.store_name = #{param.shopId} + and lbsc.linkman = #{param.forwardingUnit} + and lbss.warehouseService = #{param.warehouseService} + 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 d42c5307f..597ee314e 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 @@ -7,8 +7,11 @@ - + 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 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataShopService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataShopService.java index cc2eccc60..de254df1e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataShopService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataShopService.java @@ -51,4 +51,6 @@ public interface IBasicdataShopService extends BaseService List exportBasicdataShop(Wrapper queryWrapper); IPage taglibPage(IPage page, Map basicdataShop); + + Boolean saveSubmit(BasicdataShopEntity basicdataShop); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java index b22740b53..2533d334a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java +++ b/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 exportBasicdataStorageServices(Wrapper queryWrapper); + boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices); + + List pageList(IPage page, Map basicdataStorageServices); } 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 f153ff66a..5c43062e0 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 @@ -49,4 +49,5 @@ public interface IBasicdataStoreBrandService extends BaseService exportBasicdataStoreBrand(Wrapper queryWrapper); + Boolean submitSave(BasicdataStoreBrandEntity basicdataStoreBrand); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java index f4700605b..400109705 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java +++ b/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 basicdataShopEntities = baseMapper.selectList(Wrappers.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); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index ec2dd2d1d..7513f179a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/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 basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.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 pageList(IPage page, Map basicdataStorageServices) { + BasicdataStorageServicesEntity basicdataStorageServicesEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataStorageServices), BasicdataStorageServicesEntity.class); + BasicdataStorageServicesVO basicdataStorageServicesvo = new BasicdataStorageServicesVO() ; + BeanUtils.copyProperties(basicdataStorageServicesEntity,basicdataStorageServicesvo); + return baseMapper.selectBasicdataStorageServicesPage(page,basicdataStorageServicesvo); + } + } 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 3f8072e54..10c4f6463 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 @@ -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 basicdataStoreBrandEntities = baseMapper.selectList(Wrappers.query().lambda() + .eq(BasicdataStoreBrandEntity::getShopId, basicdataStoreBrand.getShopId()) + .eq(BasicdataStoreBrandEntity::getBrandId, basicdataStoreBrand.getBrandId()) + ); + if(basicdataStoreBrandEntities.size() > 0){ + throw new RuntimeException("当前门店已拥有该品牌！"); + } + return this.saveOrUpdate(basicdataStoreBrand); + } + }