feat(all): 修改价格计算

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

@@ -97,6 +97,8 @@ public class BasicdataFreightEntity extends TenantEntity {
 	@NotBlank(message = "品类必填")
 	@ApiModelProperty(value = "品类")
 	private String category;
+	@ApiModelProperty(value = "品类名称")
+	private String categoryName;
 	/**
 	 * 一口价
 	 */

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

@@ -30,7 +30,6 @@ 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;
@@ -128,11 +127,7 @@ public class BasicdataFreightController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataFreight")
 	public R submit(@Valid @RequestBody BasicdataFreightDTO basicdataFreight) {
-		try {
-			return R.status(basicdataFreightService.ownSaveOrUpdate(basicdataFreight));
-		} catch (CustomerException e) {
-			return R.fail(e.code, e.message);
-		}
+		return R.status(basicdataFreightService.ownSaveOrUpdate(basicdataFreight));
 	}
 
 	/**

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()).eq("is_deleted",0);
+		queryWrapper1.eq("item_name", param.getItemName()).like("category", param.getCategory()).eq("is_deleted",0);
 		BasicdataFreightEntity freightEntity = basicdataFreightService.getOne(queryWrapper1);
 		List<BasicdataFreightDetailEntity> objects = new ArrayList<>();
 		if (null != freightEntity) {

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

@@ -33,7 +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.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,7 +90,7 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl<BasicdataFreigh
 		}
 		List<BasicdataFreightEntity> list = this.list(query);
 		if (CollectionUtil.isNotEmpty(list)) {
-			throw new CustomerException(5000, "名称+品类存在其他表单中，请检查。");
+			throw new ServiceException("名称+品类存在其他表单中，请检查。");
 		}
 		BasicdataFreightEntity basicdataFreightEntity = new BasicdataFreightEntity();
 		Byte fixedPrice = basicdataFreight.getFixedPrice();