From 2c016bf710c5c5a1b66a53ef8f99c40442ff8c08 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Tue, 5 Mar 2024 11:33:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BB=B7=E6=A0=BC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataFreightEntity.java | 8 +++---- .../BasicdataFreightController.java | 11 ++++++---- .../feign/BasicdataFreightClient.java | 4 ++-- .../impl/BasicdataFreightServiceImpl.java | 21 +++++++++++++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java index 769c3d19b..5e11e44ea 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java @@ -84,8 +84,8 @@ public class BasicdataFreightEntity extends TenantEntity { /** * 门店 */ - @ApiModelProperty(value = "门店") - private Long shop; +// @ApiModelProperty(value = "门店") +// private Long shop; /** * 品牌 */ @@ -96,7 +96,7 @@ public class BasicdataFreightEntity extends TenantEntity { */ @NotBlank(message = "品类必填") @ApiModelProperty(value = "品类") - private Long category; + private String category; /** * 一口价 */ @@ -115,7 +115,7 @@ public class BasicdataFreightEntity extends TenantEntity { /** * 类型 */ - @ApiModelProperty(value = "类型") + @ApiModelProperty(value = "服务类型") private Integer type; /** * 标识;1 干仓配 2 一口价 3 每趟 4户 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java index 2cf4db88d..d593a2959 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataFreightController.java @@ -30,6 +30,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -39,7 +40,6 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -75,7 +75,7 @@ public class BasicdataFreightController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入basicdataFreight") - public R detail(@Validated BasicdataFreightEntity basicdataFreight) { + public R detail(BasicdataFreightEntity basicdataFreight) { return R.data(basicdataFreightService.getDetail(basicdataFreight)); } @@ -128,8 +128,11 @@ public class BasicdataFreightController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicdataFreight") public R submit(@Valid @RequestBody BasicdataFreightDTO basicdataFreight) { - - return R.status(basicdataFreightService.ownSaveOrUpdate(basicdataFreight)); + try { + return R.status(basicdataFreightService.ownSaveOrUpdate(basicdataFreight)); + } catch (CustomerException e) { + return R.fail(e.code, e.message); + } } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java index b972fdabe..9adefcaa3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataFreightClient.java @@ -62,7 +62,7 @@ public class BasicdataFreightClient implements IBasicdataFreightClient { @GetMapping(PRICE) public List pirce(BasicdataFreightApiVO param) { QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("item_name", param.getItemName()).eq("category", param.getCategory()); + queryWrapper1.eq("item_name", param.getItemName()).eq("category", param.getCategory()).eq("is_deleted",0); BasicdataFreightEntity freightEntity = basicdataFreightService.getOne(queryWrapper1); List objects = new ArrayList<>(); if (null != freightEntity) { @@ -79,7 +79,7 @@ public class BasicdataFreightClient implements IBasicdataFreightClient { objects.add(detailEntity); } else { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("freight_id", freightEntity.getId()).ne("is_deleted", 1); + queryWrapper.eq("freight_id", freightEntity.getId()).eq("is_deleted", 0); List list = basicdataFreightDetailService.list(queryWrapper); objects.addAll(list); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java index eb96081f9..8d8f595fb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataFreightServiceImpl.java @@ -33,6 +33,7 @@ import com.logpm.basicdata.service.IBasicdataFreightService; import com.logpm.basicdata.vo.BasicdataFreightVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springframework.beans.factory.annotation.Autowired; @@ -79,14 +80,26 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl query = new QueryWrapper<>(); + query.eq("item_name", basicdataFreight.getItemName()) + .in("category", basicdataFreight.getCategory().split(",")) + .eq("is_deleted", 0); + if (ObjectUtils.isNotNull(basicdataFreight.getId())) { + query.ne("id", basicdataFreight.getId()); + } + List list = this.list(query); + if (CollectionUtil.isNotEmpty(list)) { + throw new CustomerException(5000, "名称+品类存在其他表单中，请检查。"); + } BasicdataFreightEntity basicdataFreightEntity = new BasicdataFreightEntity(); Byte fixedPrice = basicdataFreight.getFixedPrice(); - if(1 == fixedPrice){ + BeanUtil.copyProperties(basicdataFreight, basicdataFreightEntity); + if (1 == fixedPrice) { basicdataFreightEntity.setIdentification(2); - }else{ + } else { basicdataFreightEntity.setIdentification(1); } - BeanUtil.copyProperties(basicdataFreight, basicdataFreightEntity); //修改 if (ObjectUtils.isNotNull(basicdataFreight.getId())) { // 修改主表单 @@ -119,7 +132,7 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl objectQueryWrapper = new QueryWrapper<>(); - objectQueryWrapper.eq("freight_id", detail.getId()).ne("is_deleted", 1); + objectQueryWrapper.eq("freight_id", detail.getId()).eq("is_deleted", 0); List list = detailService.list(objectQueryWrapper); if (CollectionUtil.isNotEmpty(list)) { List detailDTOS = new ArrayList<>();