From c59a491bb7a5558d47f8e6aa550be17319e5b770 Mon Sep 17 00:00:00 2001 From: zhangji <1315410739@qq.com> Date: Thu, 4 Sep 2025 16:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E5=A4=87IMEI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/controller/admin/spu/vo/ProductSpuPageReqVO.java | 3 +++ .../product/controller/admin/spu/vo/ProductSpuRespVO.java | 4 ++++ .../product/controller/admin/spu/vo/ProductSpuSaveReqVO.java | 4 ++++ .../controller/app/spu/vo/AppProductSpuDetailRespVO.java | 4 ++++ .../product/controller/app/spu/vo/AppProductSpuRespVO.java | 4 ++++ .../module/product/dal/dataobject/spu/ProductSpuDO.java | 5 +++++ .../yudao/module/product/dal/mysql/spu/ProductSpuMapper.java | 4 +++- .../framework/web/config/ProductWebConfiguration.java | 2 ++ .../module/product/service/spu/ProductSpuServiceImpl.java | 4 ++-- 9 files changed, 31 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java index 1f53e05..4b1dd39 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java @@ -55,6 +55,9 @@ public class ProductSpuPageReqVO extends PageParam { @Schema(description = "商品类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer types; + @Schema(description = "设备IMEI", example = "371") + private String deviceId; + @Schema(description = "创建人id", example = "1") private String creator; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java index 1ba6c23..11b9e1f 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java @@ -45,6 +45,10 @@ public class ProductSpuRespVO { @ExcelProperty("商品品牌编号") private Long brandId; + @Schema(description = "设备IMEI", requiredMode = Schema.RequiredMode.REQUIRED, example = "371") + @ExcelProperty("设备IMEI") + private String deviceId; + @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xx.png") @ExcelProperty("商品封面图") private String picUrl; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java index 5f4243d..5ec7da4 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.product.controller.admin.spu.vo; import cn.iocoder.yudao.module.product.enums.spu.ProductSpuTypesEnum; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -36,6 +37,9 @@ public class ProductSpuSaveReqVO { @NotNull(message = "商品分类不能为空") private Long categoryId; + @Schema(description = "设备IMEI", requiredMode = Schema.RequiredMode.REQUIRED, example = "371") + private String deviceId; + @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "商品品牌不能为空") private Long brandId; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java index 525f224..0185e77 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.product.controller.app.spu.vo; import cn.iocoder.yudao.module.product.controller.app.property.vo.value.AppProductPropertyValueDetailRespVO; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -27,6 +28,9 @@ public class AppProductSpuDetailRespVO { @Schema(description = "商品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long categoryId; + @Schema(description = "设备IMEI", requiredMode = Schema.RequiredMode.REQUIRED, example = "371") + private String deviceId; + @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED) private String picUrl; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java index bf4fae2..ff009b6 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.product.controller.app.spu.vo; import cn.iocoder.yudao.module.product.enums.spu.ProductSpuTypesEnum; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -22,6 +23,9 @@ public class AppProductSpuRespVO { @Schema(description = "分类编号", requiredMode = Schema.RequiredMode.REQUIRED) private Long categoryId; + @Schema(description = "设备IMEI", requiredMode = Schema.RequiredMode.REQUIRED, example = "371") + private String deviceId; + @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED) private String picUrl; diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java index 17f63ee..42c6547 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/spu/ProductSpuDO.java @@ -68,6 +68,11 @@ public class ProductSpuDO extends BaseDO { * 关联 {@link ProductBrandDO#getId()} */ private Long brandId; + + /** + * 设备IMEI + */ + private String deviceId; /** * 商品封面图 */ diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java index e2a4b2d..8a7f2a4 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java @@ -64,7 +64,9 @@ public interface ProductSpuMapper extends BaseMapperX { default PageResult selectPage(AppProductSpuPageReqVO pageReqVO, Set categoryIds) { LambdaQueryWrapperX query = new LambdaQueryWrapperX() //根据创建人查询商品 - .eqIfPresent(ProductSpuDO::getCreator, pageReqVO.getCreator()) +// .eqIfPresent(ProductSpuDO::getCreator, pageReqVO.getCreator()) + //根据设备id查询商品 + .eqIfPresent(ProductSpuDO::getDeviceId, pageReqVO.getDeviceId()) //根据类型查询商品 .eqIfPresent(ProductSpuDO::getTypes, pageReqVO.getTypes()) // 关键字匹配，目前只匹配商品名 diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java index eac0e48..61c8e2a 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/framework/web/config/ProductWebConfiguration.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.product.framework.web.config; import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import cn.iocoder.yudao.module.product.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; @@ -33,6 +34,7 @@ public class ProductWebConfiguration { // rule.addDeptColumn(DeptDO.class, "id"); // user rule.addUserColumn(ProductSpuDO.class, "creator"); + rule.addUserColumn(DeviceDO.class, "creator"); }; } diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java index 58a9675..c84dbb9 100644 --- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java +++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java @@ -271,11 +271,11 @@ public class ProductSpuServiceImpl implements ProductSpuService { .setStatus(CommonStatusEnum.ENABLE.getStatus()).setParentIds(pageReqVO.getCategoryIds())); categoryIds.addAll(convertList(categoryChildren, ProductCategoryDO::getId)); } - if (null!=pageReqVO.getDeviceId()){ + /*if (null!=pageReqVO.getDeviceId()){ //查询用户 AdminUserRespDTO user = adminUserApi.getUserByDeviceid(pageReqVO.getDeviceId()); pageReqVO.setCreator(user.getId().toString()); - } + }*/ // 分页查询 return productSpuMapper.selectPage(pageReqVO, categoryIds); }