Merge branch 'dev' into pre-production

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

@@ -71,6 +71,8 @@ public class BasicdataFreightEntity extends TenantEntity {
 	@NotBlank(message = "用户名称必填")
 	@ApiModelProperty(value = "物品名称")
 	private String itemName;
+	@ApiModelProperty(value = "物品名称")
+	private String name;
 	/**
 	 * 客户—id
 	 */
@@ -91,10 +93,11 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "品牌")
 	private Long brand;
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
 	/**
 	 * 品类
 	 */
-	@NotBlank(message = "品类必填")
 	@ApiModelProperty(value = "品类")
 	private String category;
 	@ApiModelProperty(value = "品类名称")
@@ -118,7 +121,7 @@ public class BasicdataFreightEntity extends TenantEntity {
 	 * 类型
 	 */
 	@ApiModelProperty(value = "服务类型")
-	private Integer type;
+	private String type;
 	/**
 	 * 标识;1 干仓配 2 一口价 3 每趟 4户
 	 */

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

@@ -85,7 +85,7 @@ public class BasicdataFreightController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataFreight")
 	public R<IPage<BasicdataFreightEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataFreight, Query query) {
-		IPage<BasicdataFreightEntity> pages = basicdataFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataFreight, BasicdataFreightEntity.class));
+		IPage<BasicdataFreightEntity> pages = basicdataFreightService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataFreight, BasicdataFreightEntity.class).orderByDesc("update_time"));
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataFreightDTO.java

@@ -37,6 +37,7 @@ public class BasicdataFreightDTO extends BasicdataFreightEntity {
 	 * 客户ID
 	 */
 	private String clientIds;
+	private List<String> typeService;
 
 	/**
 	 * 干仓配明细

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

@@ -18,6 +18,7 @@ package com.logpm.basicdata.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -83,8 +84,13 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl<BasicdataFreigh
 		// 校验数据唯一性 名称+品类唯一
 		QueryWrapper<BasicdataFreightEntity> query = new QueryWrapper<>();
 		query.eq("item_name", basicdataFreight.getItemName())
-			.in("category", basicdataFreight.getCategory().split(","))
 			.eq("is_deleted", 0);
+		if(0 == basicdataFreight.getFixedPrice()){
+			if(StrUtil.isBlank(basicdataFreight.getCategory())){
+				throw new ServiceException("品类必填");
+			}
+			query.in("category", basicdataFreight.getCategory().split(","));
+		}
 		if (ObjectUtils.isNotNull(basicdataFreight.getId())) {
 			query.ne("id", basicdataFreight.getId());
 		}
@@ -95,6 +101,10 @@ public class BasicdataFreightServiceImpl extends BaseServiceImpl<BasicdataFreigh
 		BasicdataFreightEntity basicdataFreightEntity = new BasicdataFreightEntity();
 		Byte fixedPrice = basicdataFreight.getFixedPrice();
 		BeanUtil.copyProperties(basicdataFreight, basicdataFreightEntity);
+		if(CollectionUtil.isNotEmpty(basicdataFreight.getTypeService())){
+			List<String> typeService = basicdataFreight.getTypeService();
+			basicdataFreightEntity.setType(String.join(",", typeService));
+		}
 		if (1 == fixedPrice) {
 			basicdataFreightEntity.setIdentification(2);
 		} else {