From fcc9be49bdb5e562ec7e211071b63479c9b2b23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=9A=E5=BF=97=E8=B1=AA123?= <14699252+shang-zhihao-123@user.noreply.gitee.com> Date: Wed, 20 Nov 2024 16:05:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=91=A8=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/product/domain/ProjectInfo.java | 23 +++---- .../domain/req/ProjectInfoQueryReq.java | 9 +++ .../controller/ProjectInfoController.java | 32 +++++----- .../product/service/ProjectInfoService.java | 8 +-- .../service/impl/ProjectInfoServiceImpl.java | 60 +++++++++---------- 5 files changed, 68 insertions(+), 64 deletions(-) diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java index 680b985..7b9d185 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/ProjectInfo.java @@ -93,15 +93,15 @@ public class ProjectInfo extends BaseEntity { - private String mianTypeName; - - private String parentTypeName; - - private String typeName; - - private String ruleIdName; - - private String brandIdName; +// private String mianTypeName; +// +// private String parentTypeName; +// +// private String typeName; +// +// private String ruleIdName; +// +// private String brandIdName; /** * 查询构造器 @@ -118,11 +118,6 @@ public class ProjectInfo extends BaseEntity { .status(projectInfoQueryReq.getStatus()) .ruleId(projectInfoQueryReq.getRuleId()) .brandId(projectInfoQueryReq.getBrandId()) - .mianTypeName(null) - .parentTypeName(null) - .typeName(null) - .ruleIdName(null) - .brandIdName(null) .build(); } diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java index dd509ac..97868c2 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/req/ProjectInfoQueryReq.java @@ -63,4 +63,13 @@ public class ProjectInfoQueryReq extends BaseEntity { @ApiModelProperty(name = "品牌", value = "品牌") private Long brandId; +// private String mianTypeName; +// +// private String parentTypeName; +// +// private String typeName; +// +// private String ruleIdName; +// +// private String brandIdName; } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index 8f879aa..d0f370b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java @@ -64,16 +64,16 @@ public class ProjectInfoController extends BaseController { public Result> list(ProjectInfoQueryReq projectInfoQueryReq) { startPage(); List list = projectInfoService.list(ProjectInfo.queryBuild(projectInfoQueryReq)); - // - for (ProjectInfo info : list) { - RuleInfo byId = ruleInfoService.getById(info.getRuleId()); - info.setRuleIdName(byId.getName()); - } - // - for (ProjectInfo info : list) { - BrandInfo byId = brandInfoService.getById(info.getBrandId()); - info.setRuleIdName(byId.getNam()); - } +// // 规格 +// for (ProjectInfo info : list) { +// RuleInfo byId = ruleInfoService.getById(info.getRuleId()); +// info.setRuleIdName(byId.getName()); +// } +// // 品牌 +// for (ProjectInfo info : list) { +// BrandInfo byId = brandInfoService.getById(info.getBrandId()); +// info.setRuleIdName(byId.getNam()); +// } return getDataTable(list); } @@ -98,13 +98,13 @@ public class ProjectInfoController extends BaseController { @RequiresPermissions("product:info:query") @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) -// public Result getInfo(@PathVariable("id") Long id) { -// return Result.success(projectInfoCache.get(id)); -// } - public Result getInfo(@PathVariable("id") Long id) { - ProjectInfoSaveReq projectUpdInfo = projectInfoService.get(id); - return Result.success(projectUpdInfo); + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(projectInfoCache.get(id)); } +// public Result getInfo(@PathVariable("id") Long id) { +// ProjectInfoSaveReq projectUpdInfo = projectInfoService.get(id); +// return Result.success(projectUpdInfo); +// } /** * 获取商品信息详细信息 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java index 55858e7..5b69ada 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProjectInfoService.java @@ -34,9 +34,9 @@ public interface ProjectInfoService extends IService { * @return 商品详情 */ ProjectDetailResp getDetailInfo (Long id); - /** - * 获取商品信息详细信息 - */ - ProjectInfoSaveReq get(Long id); +// /** +// * 获取商品信息详细信息 +// */ +// ProjectInfoSaveReq get(Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java index 219258e..bfec332 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProjectInfoServiceImpl.java @@ -229,34 +229,34 @@ public class ProjectInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AsProductAttributeInfo::getProductId,id); - List attributeInfoList = asProductAttributeInfoService.list(queryWrapper); - List longs = attributeInfoList.stream().map(AsProductAttributeInfo::getAttributeId).toList(); - List arrayList = new ArrayList<>(); - for (Long aLong : longs) { - AttributeInfo attributeInfo = projectInfoMapper.selectProject(aLong); - arrayList.add(attributeInfo); - } - // sku - LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); - queryWrapper1.eq(ProjectSkuInfo::getProjectId,id); - List projectSkuInfoList = projectSkuInfoService.list(queryWrapper1); - List longs1 = projectSkuInfoList.stream().map(ProjectSkuInfo::getId).toList(); - ArrayList skuInfoArrayList = new ArrayList<>(); - for (Long aLong : longs1) { - ProjectSkuInfo projectSkuInfo = projectInfoMapper.selectProjectSkuInfo(aLong); - skuInfoArrayList.add(projectSkuInfo); - } - return ProjectInfoSaveReq.builder() - .projectAddModel(info) - .attrValueList(arrayList) - .projectSkuInfoList(skuInfoArrayList) - .build(); - } +// @Override +// public ProjectInfoSaveReq get(Long id) { +// // 商品信息 +// ProjectInfo info = this.getById(id); +// // 商品属性表中间表 +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(AsProductAttributeInfo::getProductId,id); +// List attributeInfoList = asProductAttributeInfoService.list(queryWrapper); +// List longs = attributeInfoList.stream().map(AsProductAttributeInfo::getAttributeId).toList(); +// List arrayList = new ArrayList<>(); +// for (Long aLong : longs) { +// AttributeInfo attributeInfo = projectInfoMapper.selectProject(aLong); +// arrayList.add(attributeInfo); +// } +// // sku +// LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); +// queryWrapper1.eq(ProjectSkuInfo::getProjectId,id); +// List projectSkuInfoList = projectSkuInfoService.list(queryWrapper1); +// List longs1 = projectSkuInfoList.stream().map(ProjectSkuInfo::getId).toList(); +// ArrayList skuInfoArrayList = new ArrayList<>(); +// for (Long aLong : longs1) { +// ProjectSkuInfo projectSkuInfo = projectInfoMapper.selectProjectSkuInfo(aLong); +// skuInfoArrayList.add(projectSkuInfo); +// } +// return ProjectInfoSaveReq.builder() +// .projectAddModel(info) +// .attrValueList(arrayList) +// .projectSkuInfoList(skuInfoArrayList) +// .build(); +// } }