feat(all): 修改客户价格逻辑

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户

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<BasicdataFreightDTO> detail(@Validated BasicdataFreightEntity basicdataFreight) {
+	public R<BasicdataFreightDTO> 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);
+		}
 	}
 
 	/**

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<BasicdataFreightDetailEntity> pirce(BasicdataFreightApiVO param) {
 		QueryWrapper<BasicdataFreightEntity> 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<BasicdataFreightDetailEntity> objects = new ArrayList<>();
 		if (null != freightEntity) {
@@ -79,7 +79,7 @@ public class BasicdataFreightClient implements IBasicdataFreightClient {
 				objects.add(detailEntity);
 			} else {
 				QueryWrapper<BasicdataFreightDetailEntity> queryWrapper = new QueryWrapper();
-				queryWrapper.eq("freight_id", freightEntity.getId()).ne("is_deleted", 1);
+				queryWrapper.eq("freight_id", freightEntity.getId()).eq("is_deleted", 0);
 				List<BasicdataFreightDetailEntity> list = basicdataFreightDetailService.list(queryWrapper);
 				objects.addAll(list);
 			}

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<BasicdataFreigh
 	@Override
 	public Boolean ownSaveOrUpdate(BasicdataFreightDTO basicdataFreight) {
 		log.info("接收的数据{}", basicdataFreight);
+		// 校验数据唯一性 名称+品类唯一
+		QueryWrapper<BasicdataFreightEntity> 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<BasicdataFreightEntity> 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<BasicdataFreigh
 		if (null != detail) {
 			BeanUtil.copyProperties(detail, basicdataFreightDTO);
 			QueryWrapper<BasicdataFreightDetailEntity> objectQueryWrapper = new QueryWrapper<>();
-			objectQueryWrapper.eq("freight_id", detail.getId()).ne("is_deleted", 1);
+			objectQueryWrapper.eq("freight_id", detail.getId()).eq("is_deleted", 0);
 			List<BasicdataFreightDetailEntity> list = detailService.list(objectQueryWrapper);
 			if (CollectionUtil.isNotEmpty(list)) {
 				List<BasicdataFreightDetailDTO> detailDTOS = new ArrayList<>();