From f78a0ede2b2bcb0cb3b0f3ab3993b586dae7cb63 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: Mon, 2 Dec 2024 22:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/策略 | 34 +++++++++++-- .../model/ActivityTeamInfoAddModel.java | 6 --- ...vityTeamProductSkuInfoForeignKeyModel.java | 51 +++++++++++++++++++ .../domain/resp/ActivityTeamDetailResp.java | 2 - .../domain/resp/TeamInfoFindByIdResp.java | 2 - .../controller/ActivityTeamController.java | 34 ++++++++++--- .../team/mapper/ActivityTeamInfoMapper.java | 5 +- .../team/service/ActivityTeamInfoService.java | 6 +++ .../impl/ActivityTeamInfoServiceImpl.java | 14 ++++- ...ActivityTeamProductSkuInfoServiceImpl.java | 9 +++- .../controller/CommentInfoController.java | 7 +++ .../product/service/CommentInfoService.java | 5 +- .../service/impl/CommentInfoServiceImpl.java | 13 +++-- 13 files changed, 160 insertions(+), 28 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoForeignKeyModel.java diff --git a/doc/策略 b/doc/策略 index e401979..8bd44b9 100644 --- a/doc/策略 +++ b/doc/策略 @@ -1,4 +1,30 @@ -1.图片,金额,商品描述 -2.拼团 -3.评价 -4.购买方式 +{ + "name": "1", + "productId": 1, + "productImage": "1", + "introduction": "1", + "unit": "1", + "imageList": "1", + "endTime": "2024-12-01 16:26:08", + "sort": 1, + "teamProjectSkuInfoAddReqList": [ + { + "sku": "1", + "teamPrice": 1, + "teamStock": 1 + } + ], + "content": "1", + "status": "1", + "strategyType": "1", + "strategyId": 1, + "createBy": "1", + "createTime": "2024-12-01 16:26:08", + "updateBy": "1", + "updateTime": "2024-12-01 16:26:08", + "remark": "1", + "params": { + "KEY": { + } + } +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index e1215cf..d190f3f 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java @@ -12,12 +12,6 @@ import java.util.Date; import java.util.List; import java.util.function.Supplier; -/** - * 团购活动添加模型 - * - * @author DongZeLiang - * @date 2024-11-26 09:38 - */ @Data @Builder @NoArgsConstructor diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoForeignKeyModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoForeignKeyModel.java new file mode 100644 index 0000000..a72eba3 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoForeignKeyModel.java @@ -0,0 +1,51 @@ +package com.muyu.marketing.domain.model; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 商品活动SKU信息模型 + * + * @author DongZeLiang + * @date 2024-11-26 15:35 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuInfoForeignKeyModel extends ActivityTeamProductSkuInfoModel{ + + /** + * 拼团名称 + */ + private Integer name; + /** + * 商品活动图 + */ + private Integer productImage; + /** + * 活动简介 + */ + private Integer introduction; + /** + * 单位 + */ + private Integer unit; + /** + * 轮播图 + */ + private Integer imageList; + /** + * 活动结束时间 + */ + private Integer endTime; + /** + * 活动详情 + */ + private Integer content; + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java index 33d5ddb..e896bd5 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java @@ -41,12 +41,10 @@ public class ActivityTeamDetailResp extends BaseEntity { /** * 单位 */ - private String unit; /** * 轮播图 */ - private String imageList; /** * 活动结束时间 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java index c99b334..7c60f72 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java @@ -44,12 +44,10 @@ public class TeamInfoFindByIdResp { /** * 单位 */ - private String unit; /** * 轮播图 */ - private String imageList; /** * 活动结束时间 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 b10bdca..6cdb76e 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 @@ -1,9 +1,12 @@ package com.muyu.marketing.team.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; @@ -58,21 +61,37 @@ public class ActivityTeamController { @PostMapping("/save") public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); - return Result.success(); + return Result.success("添加成功"); } /** * 根据id查询 */ @PostMapping("/detail") - public List findListByTeamId(Long teamId){ + public List findListByTeamId(Long teamId) { List list = skuInfoService.findListByTeamId(teamId); return list; } + + /** + * 评论 + * @param id + * @return + */ + @GetMapping("/findTeam/{id}") + public Result> findTeam(@PathVariable("id") Long id){ + return Result.success(activityTeamInfoService.findTeam(id)); + } + + /** 根据id回显 + * @param id + * @return + */ @PostMapping("/findById/{id}") - public Result findTeamById(@PathVariable Long id){ + public Result findTeamById(@PathVariable Long id) { return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } + @PutMapping("/updateByTeamId") public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); @@ -83,11 +102,12 @@ public class ActivityTeamController { * 团购活动列表 */ @GetMapping("/teamList") - public Result> teamList(){ - List list = activityTeamInfoService.list(); + public Result> teamList( TeamInfoListReq teamInfoListReq){ + PageHelper.startPage(teamInfoListReq.getPageNum(), teamInfoListReq.getPageSize()); + PageInfo pageInfo = new PageInfo<>(activityTeamInfoService.list()); TableDataInfo tableDataInfo = new TableDataInfo<>(); - tableDataInfo.setRows(list); - tableDataInfo.setTotal(list.size()); + tableDataInfo.setRows(pageInfo.getList()); + tableDataInfo.setTotal(pageInfo.getTotal()); return Result.success(tableDataInfo); } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java index 85e3f4d..428dedc 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java @@ -2,9 +2,12 @@ package com.muyu.marketing.team.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoForeignKeyModel; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface ActivityTeamInfoMapper extends BaseMapper { - +// List lists(); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index f1409d4..0910102 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -5,6 +5,8 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.*; +import java.util.List; + public interface ActivityTeamInfoService extends IService { @@ -35,5 +37,9 @@ public interface ActivityTeamInfoService extends IService { */ boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); + List findTeam(Long id); + + +// List lists(); } 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 38a662a..2f8443d 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; @@ -27,6 +28,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) { @@ -73,7 +76,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl teamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList(); teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId())); this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList); @@ -105,4 +108,13 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl findTeam(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamInfo::getProductId,id); + queryWrapper.last("limit 2"); + return this.list(queryWrapper); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index 25c1036..b832441 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -87,13 +87,20 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl findListByTeamId(Long teamId) { +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId); +// List list = this.list(queryWrapper); +// return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList(); +//// return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList(); +// } @Override public List findListByTeamId(Long teamId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId); List list = this.list(queryWrapper); return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList(); -// return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList(); } @Transactional 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 9500949..e28f7f8 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 @@ -74,6 +74,13 @@ public class CommentInfoController extends BaseController { public Result getInfo(@PathVariable("id") Long id) { return Result.success(commentInfoService.getById(id)); } + /** + * 前三条评论 + */ + @GetMapping(value = "/find/{id}") + public Result> getFindById(@PathVariable("id") Long id) { + return Result.success(commentInfoService.getFindById(id)); + } /** * 新增商品评论 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..14b2441 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 @@ -18,5 +18,8 @@ public interface CommentInfoService extends IService { * @return 商品评论集合 */ public List list(CommentInfo commentInfo); - + /** + * 前三条评论 + */ + List getFindById(Long id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java index 365a5c4..7f05c22 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java @@ -49,9 +49,16 @@ public class CommentInfoServiceImpl extends ServiceImpl getFindById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CommentInfo::getProjectId,id); + queryWrapper.last("limit 2"); + return this.list(queryWrapper); + } }