From f92107718d728a2bfa6e7bb3127007586616d5ee Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 11:41:26 +0800
Subject: [PATCH] feat(mall): 添加活动评价功能
---
src/main/resources/mapper/modules/HappyActivityOptionMapper.xml | 27 +++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 11 ++-
src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java | 5 +
src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java | 6 ++
src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java | 12 ++++
src/main/java/cc/mrbird/febs/mall/dto/activity/ApiActivityCommentDto.java | 28 +++++++++
src/main/java/cc/mrbird/febs/mall/vo/activity/ApiActivityCommentVo.java | 45 +++++++++++++++
7 files changed, 130 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
index 9361c27..fcc0f4b 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/ApiHappyActivityController.java
@@ -3,11 +3,13 @@
import cc.mrbird.febs.common.annotation.Limit;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.activity.ApiActivityCommentDto;
import cc.mrbird.febs.mall.dto.activity.ApiOperateValidRegisterActivityDto;
import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionRecordInPageDto;
import cc.mrbird.febs.mall.service.HappyActivityService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
import cc.mrbird.febs.mall.vo.activity.ApiVoteActivityHotVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,16 @@
return happyActivityService.activityInfo(dto);
}
+
+ @ApiOperation(value = "活动评价", notes = "活动评价")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = ApiActivityCommentVo.class)
+ })
+ @PostMapping(value = "/commentByActivityId")
+ public FebsResponse commentByActivityId(@RequestBody ApiActivityCommentDto dto) {
+ return new FebsResponse().success().data(happyActivityService.commentByActivityId(dto));
+ }
+
@ApiOperation(value = "点赞关注转发", notes = "点赞关注转发")
@PostMapping(value = "/operateDo")
public FebsResponse operateDo(@RequestBody @Validated ApiOperateDoDto dto) {
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiActivityCommentDto.java b/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiActivityCommentDto.java
new file mode 100644
index 0000000..2b4d301
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/activity/ApiActivityCommentDto.java
@@ -0,0 +1,28 @@
+package cc.mrbird.febs.mall.dto.activity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "ApiActivityCommentDto", description = "参数")
+public class ApiActivityCommentDto {
+
+
+ @ApiModelProperty(value = "页码", example = "1")
+ private Integer pageNow;
+
+ @ApiModelProperty(value = "每页数量", example = "10")
+ private Integer pageSize;
+
+
+ @NotNull(message = "活动ID不能为空")
+ @ApiModelProperty(value = "活动ID", example = "1")
+ private Long activityId;
+
+ @ApiModelProperty(value = "评价等级", example = "1：好评2：中评3：差评")
+ private Integer commentType;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
index 1fc8969..48e9b32 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.dto.activity.AdminHappyActivityOrderDto;
+import cc.mrbird.febs.mall.dto.activity.ApiActivityCommentDto;
import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionRecordInPageDto;
import cc.mrbird.febs.mall.entity.HappyActivity;
@@ -10,9 +11,12 @@
import cc.mrbird.febs.mall.dto.ApiVoteRecordInPageDto;
import cc.mrbird.febs.mall.vo.ApiActivityOptionListVo;
import cc.mrbird.febs.mall.vo.ApiVoteRecordInPageVo;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
public interface HappyActivityMapper extends BaseMapper<HappyActivity> {
@@ -29,4 +33,6 @@
Page<HappyActivityOrder> selectOrderInPage(Page<HappyActivityOrder> page, @Param("record")AdminHappyActivityOrderDto dto);
Page<ApiActivityOptionListVo> getVoteOptionRecordInPage(Page<ApiActivityOptionListVo> page, @Param("record")ApiVoteOptionRecordInPageDto dto);
+
+ List<ApiActivityCommentVo> selectActivityCommentPage(Page<ApiActivityCommentVo> page, @Param("record")ApiActivityCommentDto dto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
index 99842c4..ee17b5c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/HappyActivityService.java
@@ -7,7 +7,10 @@
import cc.mrbird.febs.mall.dto.ApiOperateDoDto;
import cc.mrbird.febs.mall.dto.ApiOperateVoteDto;
import cc.mrbird.febs.mall.dto.ApiVoteRecordInPageDto;
+import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
public interface HappyActivityService extends IService<HappyActivity> {
@@ -70,4 +73,6 @@
void overtimeJob();
FebsResponse addComment(ApiPayOrderAddCommentDto dto);
+
+ List<ApiActivityCommentVo> commentByActivityId(ApiActivityCommentDto dto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index 27f52ae..6f755cb 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -14,10 +14,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.mall.dto.ApiOperateDoDto;
-import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderInfoVo;
-import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderListVo;
-import cc.mrbird.febs.mall.vo.activity.ApiCheckOrderVo;
-import cc.mrbird.febs.mall.vo.activity.ApiVoteActivityHotVo;
+import cc.mrbird.febs.mall.vo.activity.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
@@ -966,6 +963,12 @@
}
@Override
+ public List<ApiActivityCommentVo> commentByActivityId(ApiActivityCommentDto dto) {
+ Page<ApiActivityCommentVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ return this.baseMapper.selectActivityCommentPage(page,dto);
+ }
+
+ @Override
public FebsResponse voteActivityHot(Long id) {
ApiVoteActivityHotVo apiVoteActivityHotVo = new ApiVoteActivityHotVo();
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/activity/ApiActivityCommentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/activity/ApiActivityCommentVo.java
new file mode 100644
index 0000000..1de6ac4
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/activity/ApiActivityCommentVo.java
@@ -0,0 +1,45 @@
+package cc.mrbird.febs.mall.vo.activity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "ApiActivityCommentVo", description = "参数")
+public class ApiActivityCommentVo {
+
+
+ @ApiModelProperty(value = "头像")
+ private String avatar;
+
+ @ApiModelProperty(value = "名称")
+ private String name;
+
+ @ApiModelProperty(value = "评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdTime;
+
+ @ApiModelProperty(value = "评分 4.0")
+ private Double star;
+
+ @ApiModelProperty(value = "评论")
+ private String comment;
+
+ @ApiModelProperty(value = "图片")
+ private String images;
+
+ @ApiModelProperty(value = "是否匿名评价 1：匿名 2：不匿名")
+ private Integer anonymousState;
+
+ @ApiModelProperty(value = "好评 大于四星")
+ private Integer greatNum;
+
+ @ApiModelProperty(value = "好评 大于三星小于四星")
+ private Integer goodNum;
+
+ @ApiModelProperty(value = "差评 小于三星")
+ private Integer badNum;
+}
diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 767b05a..2caf60b 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -136,4 +136,31 @@
order by a.likes_cnt desc
</select>
+ <select id="selectActivityCommentPage" resultType="cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo">
+ select
+ a.*,
+ b.name name,
+ b.avatar avatar
+ from happy_activity_comment a
+ left join mall_member b on b.id = a.member_id
+ <where>
+ <if test="record != null">
+ <if test="record.activityId != null and record.activityId != ''">
+ and a.activity_id = #{record.activityId}
+ </if>
+ <if test="record.commentType != null and record.commentType != '' and record.commentType == 1">
+ and a.star <![CDATA[ > ]]> 4
+ </if>
+ <if test="record.commentType != null and record.commentType != '' and record.commentType == 2">
+ and (a.star <![CDATA[ >= ]]> 3 and a.star <![CDATA[ <= ]]> 4)
+ </if>
+ <if test="record.commentType != null and record.commentType != '' and record.commentType == 3">
+ and (a.star <![CDATA[ < ]]> 3 )
+ </if>
+ </if>
+ </where>
+ group by a.id
+ order by a.created_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1