feat(box): 添加纸箱品牌和产品查询条件

- 在 BoxBrandListQry 和 BoxBrandPageQry 中新增 type 字段用于筛选品牌类型
- 在 BoxProductListQry 和 BoxProductPageQry 中新增 type 字段用于筛选产品品牌类型
- 更新 BoxBrandDO 和 BoxProductDO 实体类，增加 type 字段并映射数据库列
- 修改 BoxBrandGatewayImpl 和 BoxProductGatewayImpl 查询逻辑，支持按 type 过滤
- 在 BoxProductMapper.xml 中添加 type 字段的映射配置

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/BoxBrandDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -36,6 +37,12 @@ public class BoxBrandDO extends BaseDO<BoxBrandDO> {
 	@TableField(value = "image")
 	private String image;
 
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@TableField(value = "type")
+	private BoxBrandTypeEnum type;
+
 	/**
 	 * 备注
 	 */

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/BoxProductDO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.api.biz.dto.enums.BoxProductSpecTypeEnum;
 import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO;
 import lombok.Data;
@@ -61,6 +62,12 @@ public class BoxProductDO extends BaseDO<BoxProductDO> {
 	@TableField(value = "brand_id")
 	private Long brandId;
 
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@TableField(value = "type")
+	private BoxBrandTypeEnum type;
+
 	/**
 	 * 备注
 	 */
@@ -73,5 +80,4 @@ public class BoxProductDO extends BaseDO<BoxProductDO> {
 	@TableField(value = "status")
 	private Boolean status;
 
-}
+}
-

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxBrandGatewayImpl.java

@@ -46,6 +46,9 @@ public class BoxBrandGatewayImpl implements BoxBrandGateway {
 	@Override
 	public IPage<BoxBrand> page(BoxBrandPageQry boxBrandPageQry) {
 		LambdaQueryWrapper<BoxBrandDO> queryWrapper = Wrappers.lambdaQuery(BoxBrandDO.class);
+		queryWrapper.eq(Objects.nonNull(boxBrandPageQry.getStatus()), BoxBrandDO::getStatus, boxBrandPageQry.getStatus());
+		queryWrapper.eq(Objects.nonNull(boxBrandPageQry.getBrandId()), BoxBrandDO::getBrandId, boxBrandPageQry.getBrandId());
+		queryWrapper.eq(Objects.nonNull(boxBrandPageQry.getType()), BoxBrandDO::getType, boxBrandPageQry.getType());
 		queryWrapper.orderByDesc(BoxBrandDO::getCreatedAt);
 
 		IPage<BoxBrandDO> page = new Page<>(boxBrandPageQry.getPageIndex(), boxBrandPageQry.getPageSize());
@@ -58,6 +61,8 @@ public class BoxBrandGatewayImpl implements BoxBrandGateway {
 	public List<BoxBrand> list(BoxBrandListQry boxBrandListQry) {
 		LambdaQueryWrapper<BoxBrandDO> queryWrapper = Wrappers.lambdaQuery(BoxBrandDO.class);
 		queryWrapper.eq(Objects.nonNull(boxBrandListQry.getStatus()), BoxBrandDO::getStatus, boxBrandListQry.getStatus());
+		queryWrapper.eq(Objects.nonNull(boxBrandListQry.getBrandId()), BoxBrandDO::getBrandId, boxBrandListQry.getBrandId());
+		queryWrapper.eq(Objects.nonNull(boxBrandListQry.getType()), BoxBrandDO::getType, boxBrandListQry.getType());
 		queryWrapper.orderByDesc(BoxBrandDO::getCreatedAt);
 		List<BoxBrandDO> boxBrandDOList = boxBrandMapper.selectList(queryWrapper);
 

erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxProductGatewayImpl.java

@@ -47,6 +47,7 @@ public class BoxProductGatewayImpl implements BoxProductGateway {
 		queryWrapper.eq(Objects.nonNull(boxProductPageQry.getStatus()), BoxProductDO::getStatus, boxProductPageQry.getStatus());
 		queryWrapper.eq(Objects.nonNull(boxProductPageQry.getBrandId()), BoxProductDO::getBrandId, boxProductPageQry.getBrandId());
 		queryWrapper.eq(Objects.nonNull(boxProductPageQry.getSpecType()), BoxProductDO::getSpecType, boxProductPageQry.getSpecType());
+		queryWrapper.eq(Objects.nonNull(boxProductPageQry.getType()), BoxProductDO::getType, boxProductPageQry.getType());
 
 		queryWrapper.orderByDesc(BoxProductDO::getCreatedAt);
 
@@ -59,6 +60,7 @@ public class BoxProductGatewayImpl implements BoxProductGateway {
 	@Override
 	public List<BoxProduct> list(BoxProductListQry boxProductListQry) {
 		LambdaQueryWrapper<BoxProductDO> queryWrapper = Wrappers.lambdaQuery(BoxProductDO.class);
+		queryWrapper.eq(Objects.nonNull(boxProductListQry.getType()), BoxProductDO::getType, boxProductListQry.getType());
 		List<BoxProductDO> boxProductDOList = boxProductMapper.selectList(queryWrapper);
 		return boxProductDOList.stream().map(boxProductConvert::toBoxProduct).toList();
 	}
@@ -96,5 +98,4 @@ public class BoxProductGatewayImpl implements BoxProductGateway {
 		BoxProductDO boxProductDO = boxProductMapper.selectOne(queryWrapper);
 		boxProductDO.deleteById();
 	}
-}
+}
-

erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxProductMapper.xml

@@ -12,6 +12,7 @@
 		<result property="salePrice" column="sale_price"/>
 		<result property="specType" column="spec_type"/>
 		<result property="brandId" column="brand_id"/>
+		<result property="type" column="type"/>
 		<result property="remark" column="remark"/>
 		<result property="status" column="status"/>
 		<result property="createdAt" column="created_at"/>
@@ -20,5 +21,4 @@
 		<result property="isDelete" column="is_delete"/>
 		<result property="version" column="version"/>
 	</resultMap>
-</mapper>
+</mapper>
-

erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/BoxBrandListQry.java

@@ -1,5 +1,6 @@
 package com.xunhong.erp.turbo.api.biz.dto.qry;
 
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.base.dto.Query;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -21,5 +22,11 @@ public class BoxBrandListQry extends Query {
 
 	@Schema(title = "是否包含纸箱产品", type = "boolean")
 	private Boolean withProduct;
+
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@Schema(title = "品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱")
+	private BoxBrandTypeEnum type;
 }
 

erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/BoxBrandPageQry.java

@@ -1,5 +1,6 @@
 package com.xunhong.erp.turbo.api.biz.dto.qry;
 
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.base.dto.PageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -15,5 +16,11 @@ public class BoxBrandPageQry extends PageQuery {
 
 	@Schema(title = "纸箱品牌ID", type = "string")
 	private Long brandId;
+
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@Schema(title = "品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱")
+	private BoxBrandTypeEnum type;
 }
 

erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/BoxProductListQry.java

@@ -1,5 +1,6 @@
 package com.xunhong.erp.turbo.api.biz.dto.qry;
 
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.base.dto.Query;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -15,5 +16,10 @@ public class BoxProductListQry extends Query {
 
 	@Schema(title = "纸箱产品ID", type = "string")
 	private Long productId;
-}
+	
-
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@Schema(title = "品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱")
+	private BoxBrandTypeEnum type;
+}

erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/BoxProductPageQry.java

@@ -1,5 +1,6 @@
 package com.xunhong.erp.turbo.api.biz.dto.qry;
 
+import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum;
 import com.xunhong.erp.turbo.api.biz.dto.enums.BoxProductSpecTypeEnum;
 import com.xunhong.erp.turbo.base.dto.PageQuery;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -29,5 +30,10 @@ public class BoxProductPageQry extends PageQuery {
 	@Schema(title = "规格：1_2粒装；2_4粒装")
 	private BoxProductSpecTypeEnum specType;
 
-}
+	/**
+	 * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱
+	 */
+	@Schema(title = "品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱")
+	private BoxBrandTypeEnum type;
 
+}