From d104e9b09a5e1da0c973e3b6c910c1f3a1b87da4 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 12:05:49 +0800
Subject: [PATCH] feat(mall): 添加活动评论列表功能
---
src/main/java/cc/mrbird/febs/mall/dto/activity/AdminActivityCommentDto.java | 9 +
src/main/resources/templates/febs/views/modules/votesActivity/commentList.html | 145 +++++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java | 11 ++
src/main/resources/mapper/modules/HappyActivityOptionMapper.xml | 14 ++
src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java | 20 ++++
src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java | 5 +
src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java | 20 ++++
src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java | 9 +
src/main/java/cc/mrbird/febs/mall/vo/activity/AdminActivityCommentVo.java | 41 ++++++++
9 files changed, 270 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
index aec3b58..484e068 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
@@ -10,6 +10,7 @@
import cc.mrbird.febs.common.utils.excl.ExcelVersion;
import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
+import cc.mrbird.febs.mall.dto.AdminMallGoodsCommentDto;
import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.HappyActivity;
import cc.mrbird.febs.mall.entity.HappyActivityOption;
@@ -255,6 +256,25 @@
return adminHappyActivityService.activityOrderDel(id);
}
+ /**
+ * 评论列表
+ */
+ @GetMapping("commentList")
+ public FebsResponse getCommentList(AdminActivityCommentDto dto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminHappyActivityService.getCommentListInPage(dto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 评论列表-显示评论
+ */
+ @GetMapping("showStateSwitchOn/{id}")
+ @ControllerEndpoint(operation = "评论列表-显示评论", exceptionMessage = "设置失败")
+ public FebsResponse showStateSwitchOn(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminHappyActivityService.showStateSwitchOn(id);
+ }
+
+
@SneakyThrows
@GetMapping("/exportOptionList")
public void exportOptionList(@RequestParam Map<String, String> params, HttpServletResponse response) {
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java b/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
index ee33064..2bd5ee0 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
@@ -147,4 +147,15 @@
public String orderList() {
return FebsUtil.view("modules/votesActivity/orderList");
}
+
+
+
+ /**
+ * 活动-订单评论列表
+ */
+ @GetMapping("commentList")
+ @RequiresPermissions("commentList:view")
+ public String commentList() {
+ return FebsUtil.view("modules/votesActivity/commentList");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/activity/AdminActivityCommentDto.java b/src/main/java/cc/mrbird/febs/mall/dto/activity/AdminActivityCommentDto.java
new file mode 100644
index 0000000..5e08657
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/activity/AdminActivityCommentDto.java
@@ -0,0 +1,9 @@
+package cc.mrbird.febs.mall.dto.activity;
+
+import lombok.Data;
+
+@Data
+public class AdminActivityCommentDto {
+
+ private Long activityId;
+}
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 48e9b32..b5ba2ef 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
@@ -1,9 +1,6 @@
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.dto.activity.*;
import cc.mrbird.febs.mall.entity.HappyActivity;
import cc.mrbird.febs.mall.dto.ApiActivityInfoDto;
import cc.mrbird.febs.mall.entity.HappyActivityOrder;
@@ -11,8 +8,10 @@
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.AdminActivityCommentVo;
import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
@@ -35,4 +34,6 @@
Page<ApiActivityOptionListVo> getVoteOptionRecordInPage(Page<ApiActivityOptionListVo> page, @Param("record")ApiVoteOptionRecordInPageDto dto);
List<ApiActivityCommentVo> selectActivityCommentPage(Page<ApiActivityCommentVo> page, @Param("record")ApiActivityCommentDto dto);
+
+ IPage<AdminActivityCommentVo> getCommentListInPage(Page<AdminActivityCommentVo> page, @Param("record")AdminActivityCommentDto dto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
index 037fa1e..1a5119e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.dto.AdminHappyActivityCategoryDto;
import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -59,4 +60,8 @@
FebsResponse activityOrderDel(Long id);
List<HappyActivityOption> getVoteOptionListForExport(Map<String, String> params);
+
+ IPage<AdminActivityCommentVo> getCommentListInPage(AdminActivityCommentDto dto, QueryRequest request);
+
+ FebsResponse showStateSwitchOn(Long id);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index 33780fd..6d75e0d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -9,6 +9,8 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminHappyActivityService;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCommentVo;
+import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -37,6 +39,7 @@
private final HappyActivityCategoryMapper happyActivityCategoryMapper;
private final HappyActivityOptionMapper happyActivityOptionMapper;
private final HappyActivityOrderMapper happyActivityOrderMapper;
+ private final HappyActivityCommentMapper happyActivityCommentMapper;
private final HappyActivityOrderItemMapper happyActivityOrderItemMapper;
private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
@@ -417,4 +420,21 @@
}
return happyActivityOptionMapper.selectList(queryWrapper);
}
+
+ @Override
+ public IPage<AdminActivityCommentVo> getCommentListInPage(AdminActivityCommentDto dto, QueryRequest request) {
+ Page<AdminActivityCommentVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminActivityCommentVo> adminActivityCommentVoIPage = this.baseMapper.getCommentListInPage(page, dto);
+ return adminActivityCommentVoIPage;
+ }
+
+ @Override
+ public FebsResponse showStateSwitchOn(Long id) {
+
+ HappyActivityComment happyActivityComment = happyActivityCommentMapper.selectById(id);
+ Integer showState = StateUpDownEnum.UP.getCode() == happyActivityComment.getShowState() ? StateUpDownEnum.DOWN.getCode() : StateUpDownEnum.UP.getCode();
+ happyActivityComment.setShowState(showState);
+ happyActivityCommentMapper.updateById(happyActivityComment);
+ return new FebsResponse().success().message("操作成功");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/activity/AdminActivityCommentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/activity/AdminActivityCommentVo.java
new file mode 100644
index 0000000..180fc9c
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/activity/AdminActivityCommentVo.java
@@ -0,0 +1,41 @@
+package cc.mrbird.febs.mall.vo.activity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AdminActivityCommentVo {
+
+ private Long id;
+
+ @ApiModelProperty(value = "姓名")
+ private String memberName;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "活动名称")
+ private String activityName;
+
+ @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 = "展示状态 1：显示 2：隐藏")
+ private Integer showState;
+}
diff --git a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
index 2caf60b..87ba0ee 100644
--- a/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
+++ b/src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -163,4 +163,18 @@
order by a.created_time desc
</select>
+
+
+ <select id="getCommentListInPage" resultType="cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo">
+ select
+ a.*,
+ b.name memberName,
+ c.order_no orderNo
+ from happy_activity_comment a
+ left join mall_member b on a.member_id = b.id
+ left join happy_activity_order c on a.order_id = c.id
+ where a.activity_id = #{record.activityId}
+ order by a.created_time desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/votesActivity/commentList.html b/src/main/resources/templates/febs/views/modules/votesActivity/commentList.html
new file mode 100644
index 0000000..3089f41
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/votesActivity/commentList.html
@@ -0,0 +1,145 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-activity-comment" lay-title="评论列表">
+ <div class="layui-row febs-container">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <div class="layui-card-body febs-table-full">
+ <form class="layui-form layui-table-form" lay-filter="user-table-form">
+ <div class="layui-form-item">
+ <div class="layui-col-md10">
+ <div class="layui-inline">
+ <label class="layui-form-label layui-form-label-sm">活动</label>
+ <div class="layui-input-inline">
+ <select name="activityId" class="activity-type-comment">
+ <option value="">请选择</option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
+ <i class="layui-icon"></i>
+ </div>
+ <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
+ <i class="layui-icon"></i>
+ </div>
+ </div>
+ </div>
+ </form>
+ <table lay-filter="activityCommentTable" lay-data="{id: 'activityCommentTable'}"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- 表格操作栏 start -->
+<script type="text/html" id="showStateSwitch">
+ {{# if(d.showState === 1) { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="showStateSwitch">
+ {{# } else { }}
+ <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="showStateSwitch">
+ {{# } }}
+</script>
+<script id="showScreenHost" type="text/html">
+ {{# var srr=d.images.split(",");
+ for(var j in srr) { srr[j] }}
+ <div style="margin:0 10px; display:inline-block !important; display:inline; max-width:100px; max-height:100px;">
+ <img style=" max-width:100px; max-height:100px;" src="{{srr[j]}}" alt=""/>
+ </div>
+ {{# } }}
+</script>
+
+<!-- 表格操作栏 end -->
+<script data-th-inline="none" type="text/javascript">
+ // 引入组件并初始化
+ layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ table = layui.table,
+ $view = $('#febs-activity-comment'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'phone', type: null},
+ tableIns;
+
+ form.render();
+ //(下拉框)
+ $.get(ctx + 'admin/happyActivity/allOrderActivities', function (res) {
+ var data = res.data;
+ for (let k in data)
+ {
+ $(".activity-type-comment").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
+ });
+ });
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(activityCommentTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+ });
+
+ // 查询按钮
+ $query.on('click', function () {
+ var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
+ tableIns.reload({where: params, page: {curr: 1}});
+ });
+
+ // 刷新按钮
+ $reset.on('click', function () {
+ $searchForm[0].reset();
+ sortObject.type = 'null';
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ });
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'activityCommentTable',
+ url: ctx + 'admin/happyActivity/commentList',
+ cols: [[
+ {field: 'memberName', title: '用户', minWidth: 100,align:'left'},
+ {field: 'orderNo', title: '订单编号', minWidth: 80,align:'left'},
+ {field: 'goodsName', title: '活动名称', minWidth: 80,align:'left'},
+ {field: 'showState', title: '是否展示', templet: '#showStateSwitch', minWidth: 80,align:'center'},
+ {field: 'images', title: '图片', align: 'center', templet: '#showScreenHost', width: 400},
+ {field: 'star', title: '评分', minWidth: 50,align:'left'},
+ {field: 'comment', title: '评论', minWidth: 120,align:'left'},
+ {field: 'createdTime', title: '评价时间', minWidth: 180,align:'left'},
+ ]]
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ activityId: $searchForm.find("select[name='activityId']").val(),
+ };
+ }
+
+ function showStateSwitchOn(id) {
+ febs.get(ctx + 'admin/happyActivity/showStateSwitchOn/' + id, null, function () {
+ febs.alert.success('设置成功');
+ $query.click();
+ });
+ }
+
+
+ form.on('switch(showStateSwitch)', function (data) {
+ if (data.elem.checked) {
+ showStateSwitchOn(data.value);
+ } else {
+ showStateSwitchOn(data.value);
+ }
+ })
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1