teaching
/
2204a-cloud-server
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

补充

1129/shangzhihao
尚志豪123 2024-12-02 22:11:56 +08:00
parent c34f14ed04
commit f78a0ede2b
13 changed files with 160 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
doc/策略
View File

@ -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": {
}
}
}

6
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java
View File

@ -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

51
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoForeignKeyModel.java 100644
View File

@ -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;
}

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java
View File

@ -41,12 +41,10 @@ public class ActivityTeamDetailResp extends BaseEntity {
/**
* 单位
*/
private String unit;
/**
* 轮播图
*/
private String imageList;
/**
* 活动结束时间

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java
View File

@ -44,12 +44,10 @@ public class TeamInfoFindByIdResp {
/**
* 单位
*/
private String unit;
/**
* 轮播图
*/
private String imageList;
/**
* 活动结束时间

34
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
View File

@ -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<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
return Result.success();
return Result.success("添加成功");
}
/**
* 根据id查询
*/
@PostMapping("/detail")
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId){
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
List<ActivityTeamProductSkuModel> list = skuInfoService.findListByTeamId(teamId);
return list;
}
/**
* 评论
* @param id
* @return
*/
@GetMapping("/findTeam/{id}")
public Result<List<ActivityTeamInfo>> findTeam(@PathVariable("id") Long id){
return Result.success(activityTeamInfoService.findTeam(id));
}
/** 根据id回显
* @param id
* @return
*/
@PostMapping("/findById/{id}")
public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
public Result<TeamInfoFindByIdResp> 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<TableDataInfo<ActivityTeamInfo>> teamList(){
List<ActivityTeamInfo> list = activityTeamInfoService.list();
public Result<TableDataInfo<ActivityTeamInfo>> teamList( TeamInfoListReq teamInfoListReq){
PageHelper.startPage(teamInfoListReq.getPageNum(), teamInfoListReq.getPageSize());
PageInfo<ActivityTeamInfo> pageInfo = new PageInfo<>(activityTeamInfoService.list());
TableDataInfo<ActivityTeamInfo> tableDataInfo = new TableDataInfo<>();
tableDataInfo.setRows(list);
tableDataInfo.setTotal(list.size());
tableDataInfo.setRows(pageInfo.getList());
tableDataInfo.setTotal(pageInfo.getTotal());
return Result.success(tableDataInfo);
}
}

5
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java
View File

@ -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<ActivityTeamInfo> {
// List<ActivityTeamProductSkuInfoForeignKeyModel> lists();
}

6
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java
View File

@ -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<ActivityTeamInfo> {
@ -35,5 +37,9 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
*/
boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
List<ActivityTeamInfo> findTeam(Long id);
// List<ActivityTeamProductSkuInfoForeignKeyModel> lists();
}

14
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
View File

@ -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<ActivityTeamInfoMap
@Autowired
private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
@Autowired
private ActivityTeamInfoMapper activityTeamInfoMapper;
@Override
public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) {
@ -73,7 +76,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
@Override
public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel);
Assert.isTrue(this.save(activityTeamInfo), StringUtils.format("团购活动添加失败：[{}]", activityTeamInfoAddModel));
Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("团购活动添加失败: [{}]", activityTeamInfoAddModel));
List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
@ -105,4 +108,13 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
return update;
}
@Override
public List<ActivityTeamInfo> findTeam(Long id) {
LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ActivityTeamInfo::getProductId,id);
queryWrapper.last("limit 2");
return this.list(queryWrapper);
}
}

9
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
View File

@ -87,13 +87,20 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
* @param teamId 活动ID
* @return 拼团商品SKU集合
*/
// @Override
// public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
// LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
// List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
// return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
//// return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
// }
@Override
public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
// return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
}
@Transactional

7
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java
View File

@ -74,6 +74,13 @@ public class CommentInfoController extends BaseController {
public Result<CommentInfo> getInfo(@PathVariable("id") Long id) {
return Result.success(commentInfoService.getById(id));
}
/**
* 前三条评论
*/
@GetMapping(value = "/find/{id}")
public Result<List<CommentInfo>> getFindById(@PathVariable("id") Long id) {
return Result.success(commentInfoService.getFindById(id));
}
/**
* 新增商品评论

5
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/CommentInfoService.java
View File

@ -18,5 +18,8 @@ public interface CommentInfoService extends IService<CommentInfo> {
* @return 商品评论集合
*/
public List<CommentInfo> list(CommentInfo commentInfo);
/**
* 前三条评论
*/
List<CommentInfo> getFindById(Long id);
}

13
muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CommentInfoServiceImpl.java
View File

@ -49,9 +49,16 @@ public class CommentInfoServiceImpl extends ServiceImpl<CommentInfoMapper, Comme
}
return list(queryWrapper);
}
/**
* 前三条评论
*/
@Override
public List<CommentInfo> getFindById(Long id) {
LambdaQueryWrapper<CommentInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CommentInfo::getProjectId,id);
queryWrapper.last("limit 2");
return this.list(queryWrapper);
}
}