From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLiveController.java | 4 +++-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVo.java | 5 +++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVoV2.java | 35 +++++++++++++++++++++++------------
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLiveController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLiveController.java
index 0f9d5e7..4704213 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLiveController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLiveController.java
@@ -35,7 +35,9 @@
@ApiOperation("直播首页分页列表")
@PostMapping("/page")
public R<Page<XiaoeLiveVoV2>> page(@Valid @RequestBody XiaoeLiveQueryDto dto) {
- return R.ok(xiaoeLiveService.getLivePage(dto));
+ Page<XiaoeLiveVoV2> livePage = xiaoeLiveService.getLivePage(dto);
+ livePage.getRecords().forEach(live -> live.setAliveStartAt(live.getZbStartAt()));
+ return R.ok(livePage);
}
/**
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVo.java
index bc529de..b6266f5 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVo.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVo.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -78,10 +79,10 @@
@ApiModelProperty(value = "直播宣传图地址")
@JSONField(name = "alive_img_url")
private String aliveImgUrl; // 直播宣传图地址
-
+
@ApiModelProperty(value = "讲师列表")
@JSONField(name = "guest_list")
- private List<XiaoeLiveTeacherVo> guestList;
+ private List<XiaoeLiveTeacherVo> guestList = new ArrayList<>();
@ApiModelProperty("评论数")
@JSONField(name = "comment_count")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVoV2.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVoV2.java
index 6b8a1c4..aa0a54b 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVoV2.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/XiaoeLiveVoV2.java
@@ -1,18 +1,21 @@
package com.ruoyi.goods.domain.vo;
-import lombok.Data;
+import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
@Data
@ApiModel(description = "小鹅通直播视图对象2.0")
public class XiaoeLiveVoV2 {
-
+
@ApiModelProperty(value = "店铺ID", example = "app_id")
@JSONField(name = "app_id")
private String appId;
-
+
@ApiModelProperty(value = "直播ID", example = "id")
@JSONField(name = "id")
private String id;
@@ -152,31 +155,39 @@
@ApiModelProperty(value = "关联商品", example = "query_package_list")
@JSONField(name = "query_package_list")
private String queryPackageList;
-
+
@ApiModelProperty(value = "售卖有效期", example = "course_expire")
@JSONField(name = "course_expire")
private CourseExpire courseExpire;
-
+
@ApiModelProperty("预约状态 1:已预约 0:未预约")
- private Integer appointmentState=0;
-
+ private Integer appointmentState = 0;
+
@ApiModelProperty("创建门店")
private String shopName;
-
+
+ @ApiModelProperty(value = "直播开始时间")
+ @JSONField(name = "alive_start_at")
+ private String aliveStartAt; // 直播开始时间
+
@Data
@ApiModel(description = "Course Expire Information")
public static class CourseExpire {
-
+
@ApiModelProperty(value = "有效期类型：0=永久有效，1=固定有效期，2=自定义有效期", example = "0")
@JSONField(name = "period_type")
private Integer periodType;
-
+
@ApiModelProperty(value = "自定义有效时长", example = "period_value")
@JSONField(name = "period_value")
private String periodValue;
-
+
@ApiModelProperty(value = "是否允许重复购买：1=是，0=否", example = "0")
@JSONField(name = "is_allow_repeat_purchase")
private Integer isAllowRepeatPurchase;
+
+ @ApiModelProperty(value = "讲师列表")
+ @JSONField(name = "guest_list")
+ private List<XiaoeLiveTeacherVo> guestList = new ArrayList<>();
}
}
--
Gitblit v1.7.1