From 6866d3185dc966db2a564b779d2ca745798551b3 Mon Sep 17 00:00:00 2001 From: gao <230250245@qq.com> Date: Thu, 5 Dec 2024 10:44:14 +0800 Subject: [PATCH] 2024/12/5 --- .../model/ActivityTeamInfoListModel.java | 18 ++---- .../domain/resp/TeamInfoListResp.java | 5 ++ .../controller/ActivityTeamController.java | 4 +- .../impl/ActivityTeamInfoServiceImpl.java | 23 +------- .../impl/ProjectSkuDataRemoteImpl.java | 2 + .../remote/RemoteProjectInfoService.java | 3 +- .../remote/RemoteProjectSkuService.java | 3 +- .../product/remote/RemoteRuleAttrService.java | 7 ++- .../product/remote/RemoteRuleService.java | 7 ++- .../factory/RemoteProjectInfoFactory.java | 2 + .../remote/factory/RemoteRuleAttrFactory.java | 4 ++ .../remote/factory/RemoteRuleFactory.java | 2 + .../controller/AttributeGroupController.java | 2 +- .../controller/AttributeInfoController.java | 3 +- .../controller/BrandInfoController.java | 4 +- .../controller/CategoryInfoController.java | 8 ++- .../controller/CommentInfoController.java | 10 +++- .../controller/CommentLikeInfoController.java | 3 +- .../controller/ProjectInfoController.java | 6 +- .../controller/ProjectSkuInfoController.java | 3 +- .../controller/RuleAttrInfoController.java | 3 +- .../controller/RuleInfoController.java | 3 +- .../product/service/CommentInfoService.java | 8 +++ .../service/impl/ProjectInfoServiceImpl.java | 56 +++++++++++-------- .../src/main/resources/bootstrap.yml | 3 +- 25 files changed, 114 insertions(+), 78 deletions(-) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java index e38fadf..6309e89 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java @@ -49,6 +49,10 @@ public class ActivityTeamInfoListModel { * 拼团商品图片 */ private String productImage; + /** + * 拼团商品id + */ + private Long productId; /** * 商品价格 */ @@ -72,20 +76,6 @@ public class ActivityTeamInfoListModel { public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function function) { - ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder() - .id(activityTeamInfo.getId()) - .name(activityTeamInfo.getName()) -// .openTeamNumber(teamOpenTypeNumber) -// .addTeamNumber(teamInTypeNumber) -// .attendNumber(teamOpenTypeNumber + teamInTypeNumber) - .endTime(activityTeamInfo.getEndTime()) - .productImage(activityTeamInfo.getProductImage()) -// .teamPrice(discountPrice.getTeamPrice()) -// .productPrice(discountPrice.getProductPrice()) -// .teamStock(teamProductStockModel.getTeamStock()) -// .remainStock(teamProductStockModel.getRemainStock()) - .status(activityTeamInfo.getStatus()) - .build(); return function.apply( ActivityTeamInfoListModel.builder() .id(activityTeamInfo.getId()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java index f3e2219..16d4efe 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java @@ -48,6 +48,10 @@ public class TeamInfoListResp { * 商品价格 */ private BigDecimal productPrice; + /** + * 商品id + */ + private Long productId; /** * 剩余库存 */ @@ -80,6 +84,7 @@ public class TeamInfoListResp { .attendNumber(activityTeamInfoListModel.getAttendNumber()) .endTime(activityTeamInfoListModel.getEndTime()) .teamPrice(activityTeamInfoListModel.getTeamPrice()) + .productId(activityTeamInfoListModel.getProductId()) .productImage(activityTeamInfoListModel.getProductImage()) .productPrice(activityTeamInfoListModel.getProductPrice()) .remainStock(activityTeamInfoListModel.getRemainStock()) diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index b09d07c..89f60c7 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -53,7 +53,7 @@ public class ActivityTeamController { * @param activityTeamInfoSaveReq 添加请求对象 * @return 结果集 */ - @PostMapping + @PostMapping("/save") public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); @@ -64,7 +64,7 @@ public class ActivityTeamController { * @param id * @return */ - @PostMapping("/findById/{id}") + @PostMapping("/findTeamById/{id}") public Result findTeamById(@PathVariable Long id){ return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index f7f0d07..633f60e 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -53,6 +53,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl tableDataInfo = new TableDataInfo<>(); @@ -111,26 +112,4 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl { -// //存入id -// activityTeamUpdSKuModel.getAddSkuList().stream().forEach(add->{ -// add.setTeamId(activityTeamProductInfoUpdModel.getTeamId()); -// add.setProductId(activityTeamProductInfoUpdModel.getProductId()); -// }); -// //非空校验 业务操作 -// List addSkuList = activityTeamUpdSKuModel.getAddSkuList(); -// Assert.notNull(addSkuList, "添加的SKU列表不能为空"); -// activityTeamProductSkuInfoService.add(addSkuList); -// -// List skuList = activityTeamUpdSKuModel.getSkuList(); -// Assert.notNull(skuList, "skuList 不能为空"); -// activityTeamProductSkuInfoService.updateBath(skuList); -// -// List delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList(); -// Assert.notNull(delSkuIdList, "delSkuIdList 不能为空"); -// activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList); -// }); - - } diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java index 0c9759f..5ca234c 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java +++ b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java @@ -1,5 +1,6 @@ package com.muyu.product.cache.datasource.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; import com.muyu.product.cache.datasource.ProjectSkuData; import com.muyu.product.domain.ProjectSkuInfo; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java index 1c80460..fd88ca8 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java @@ -1,6 +1,7 @@ package com.muyu.product.remote; -import com.muyu.common.core.domain.Result; + import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; import com.muyu.product.domain.ProjectInfo; import com.muyu.product.remote.factory.RemoteProjectInfoFactory; import org.springframework.cloud.openfeign.FeignClient; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java index 7074bbf..177ced8 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java @@ -1,6 +1,7 @@ package com.muyu.product.remote; -import com.muyu.common.core.domain.Result; + import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.remote.factory.RemoteProjectSkuFactory; import org.springframework.cloud.openfeign.FeignClient; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java index 56ede04..6268dd2 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java @@ -1,8 +1,13 @@ package com.muyu.product.remote; -import com.muyu.common.core.domain.Result; + import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.RuleAttrInfo; +import com.muyu.product.remote.factory.RemoteProjectSkuFactory; import com.muyu.product.remote.factory.RemoteRuleAttrFactory; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java index 0880247..14a5ad3 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java @@ -1,8 +1,13 @@ package com.muyu.product.remote; -import com.muyu.common.core.domain.Result; + import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.RuleInfo; +import com.muyu.product.remote.factory.RemoteProjectSkuFactory; import com.muyu.product.remote.factory.RemoteRuleFactory; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java index 072a1ff..e07d42f 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java @@ -2,7 +2,9 @@ package com.muyu.product.remote.factory; import com.muyu.common.core.domain.Result; import com.muyu.product.domain.ProjectInfo; +import com.muyu.product.domain.RuleInfo; import com.muyu.product.remote.RemoteProjectInfoService; +import com.muyu.product.remote.RemoteRuleService; import org.springframework.cloud.openfeign.FallbackFactory; /** diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java index 247e197..2a11137 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java @@ -1,7 +1,11 @@ package com.muyu.product.remote.factory; + import com.muyu.common.core.domain.Result; +import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.RuleAttrInfo; +import com.muyu.product.remote.RemoteProjectSkuService; import com.muyu.product.remote.RemoteRuleAttrService; +import com.muyu.product.remote.RemoteRuleService; import org.springframework.cloud.openfeign.FallbackFactory; import java.util.List; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java index a2e0585..9a99497 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java @@ -1,7 +1,9 @@ package com.muyu.product.remote.factory; import com.muyu.common.core.domain.Result; +import com.muyu.product.domain.ProjectSkuInfo; import com.muyu.product.domain.RuleInfo; +import com.muyu.product.remote.RemoteProjectSkuService; import com.muyu.product.remote.RemoteRuleService; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index 2182ee6..71e0b2b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java @@ -3,7 +3,6 @@ package com.muyu.product.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; -import com.muyu.common.core.domain.Result; import com.muyu.product.domain.model.AttributeGroupSaveModel; import com.muyu.product.domain.resp.AttributeGroupPageResp; import com.muyu.product.domain.resp.AttributeGroupUpdResp; @@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java index 4e54002..4b09002 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java index 3c216e7..29d4305 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; @@ -24,6 +25,7 @@ import com.muyu.product.domain.req.BrandInfoQueryReq; import com.muyu.product.domain.req.BrandInfoSaveReq; import com.muyu.product.domain.req.BrandInfoEditReq; import com.muyu.product.service.BrandInfoService; +import com.muyu.common.core.web.page.TableDataInfo; /** * 品牌信息Controller diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index 52b089e..55dbaef 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java @@ -1,9 +1,13 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; +import java.util.function.Supplier; import javax.servlet.http.HttpServletResponse; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.product.domain.AttributeGroup; +import com.muyu.product.domain.AttributeInfo; +import com.muyu.product.domain.BrandInfo; import com.muyu.product.domain.model.CategoryInfoSaveModel; import com.muyu.product.domain.resp.CategoryCommonElementResp; import com.muyu.product.domain.resp.CategoryParentCommonElementResp; @@ -17,12 +21,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.domain.CategoryInfo; +import com.muyu.product.domain.req.CategoryInfoQueryReq; import com.muyu.product.domain.req.CategoryInfoSaveReq; import com.muyu.product.domain.req.CategoryInfoEditReq; import com.muyu.product.service.CategoryInfoService; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java index 55d6333..07feae5 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; @@ -42,7 +43,7 @@ public class CommentInfoController extends BaseController { * 查询商品评论列表 */ @ApiOperation("获取商品评论列表") - @RequiresPermissions("product:comment:list") + //@RequiresPermissions("product:comment:list") @GetMapping("/list") public Result> list(CommentInfoQueryReq commentInfoQueryReq) { startPage(); @@ -107,4 +108,9 @@ public class CommentInfoController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(commentInfoService.removeBatchByIds(ids)); } + + @GetMapping("listByProductId/{id}") + public List listByProductId(@PathVariable Long id) { + return commentInfoService.listByProductId(id); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java index 98da388..9e7b5b6 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; 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 70bbc19..3eb5728 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 @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; @@ -98,7 +99,8 @@ public class ProjectInfoController extends BaseController { @GetMapping(value = "/detail/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) public Result getDetailInfo(@PathVariable("id") Long id) { - return Result.success(projectInfoService.getDetailInfo(id)); + ProjectDetailResp detailInfo = projectInfoService.getDetailInfo(id); + return Result.success(detailInfo); } /** diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java index 7fc994b..6ad77df 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java index 3079414..422428b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index 3e9d463..9fec49d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java @@ -1,5 +1,5 @@ package com.muyu.product.controller; -import com.muyu.common.core.domain.Result; + import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java index 54fbcca..d92a0b1 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java @@ -1,6 +1,8 @@ package com.muyu.product.service; import java.util.List; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.product.domain.CommentInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -19,4 +21,10 @@ public interface CommentInfoService extends IService { */ public List list(CommentInfo commentInfo); + public default List listByProductId(Long id){ + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(CommentInfo::getProjectId, id); + return list(wrapper); + } + } 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 448a3d9..0d5cda7 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 @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import com.muyu.product.mapper.ProjectInfoMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.transaction.annotation.Transactional; /** * 商品信息Service业务层处理 @@ -145,6 +146,7 @@ public class ProjectInfoServiceImpl extends ServiceImpl templateAttributeGroupList = templateAttribute.getTemplateAttributeGroupList(); List templateAttributeList = new ArrayList<>(){{ addAll(templateAttribute.getTemplateAttributeList()); @@ -194,30 +200,34 @@ public class ProjectInfoServiceImpl extends ServiceImpl productAttributeList = this.asProductAttributeInfoService.list( - new LambdaQueryWrapper<>() {{ - eq(AsProductAttributeInfo::getProductId, projectInfo.getId()); - notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList); - }} - ); - List projectAttributeList = new ArrayList<>(); - if (!productAttributeList.isEmpty()){ - List attrIdList = productAttributeList.stream() - .map(AsProductAttributeInfo::getAttributeId) - .toList(); - projectAttributeList = attributeInfoService.list( - new LambdaQueryWrapper<>() {{ - in(AttributeInfo::getId, attrIdList); - }} - ).stream() - .map(TemplateAttributeModel::attributeInfoBuild) - .toList(); - } - // 把自有属性添加到商品属性的集合当中，进行合并 - if (!projectAttributeList.isEmpty()){ - templateAttributeList.addAll(projectAttributeList); + if (notInAttributeIdList.size()!=0){ + List productAttributeList = this.asProductAttributeInfoService.list( + new LambdaQueryWrapper<>() {{ + eq(AsProductAttributeInfo::getProductId, projectInfo.getId()); + notIn(AsProductAttributeInfo::getAttributeId, notInAttributeIdList); + }} + ); + List projectAttributeList = new ArrayList<>(); + if (!productAttributeList.isEmpty()){ + List attrIdList = productAttributeList.stream() + .map(AsProductAttributeInfo::getAttributeId) + .toList(); + projectAttributeList = attributeInfoService.list( + new LambdaQueryWrapper<>() {{ + in(AttributeInfo::getId, attrIdList); + }} + ).stream() + .map(TemplateAttributeModel::attributeInfoBuild) + .toList(); + } + // 把自有属性添加到商品属性的集合当中，进行合并 + if (!projectAttributeList.isEmpty()){ + templateAttributeList.addAll(projectAttributeList); + } } + + return ProjectDetailResp.builder() .projectInfo(projectInfo) .brandInfo(brandInfo) diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml index 08c72c1..c8b3e1f 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -15,16 +15,17 @@ spring: discovery: # 服务注册地址 server-addr: 113.44.75.158:8848 + namespace: gxc-muyu config: # 配置中心地址 server-addr: 113.44.75.158:8848 - namespace: gxc-muyu # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: gxc-muyu logging: level: com.muyu.product.mapper: DEBUG