From 6e9730ebbbff634d27c2c49ec328156c8905b508 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 13:52:14 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑,统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构,减少冗余的条件判断和数据转换操作

---
 src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
index ba61cd9..cac256b 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsQueryDto.java
@@ -26,12 +26,21 @@
     @ApiModelProperty(value = "分类ID")
     private Long categoryId;
 
-//    @ApiModelProperty(value = "排序字段, 默认created_time")
-//    private String order = "created_time";
+    @ApiModelProperty(value = "排序类型 1-综合排序 2-销量 3-价格 4-新品优先")
+    private Integer sortType;
 //
-//    @ApiModelProperty(value = "升序/降序", example = "asc/desc")
-//    private String sort = "desc";
+    @ApiModelProperty(value = "升序/降序", example = "asc/desc")
+    private String sort = "desc";
 
     @ApiModelProperty(value = "是否热卖", example = "1是2否")
     private Integer isHot;
+
+    @ApiModelProperty(value = "是否套餐 1-普通商品 2-套餐 3-微信小店", example = "2")
+    private Integer isNormal;
+
+    @ApiModelProperty(value = "1-付费商品 2-积分商品")
+    private Integer goodsType;
+
+    @ApiModelProperty(hidden = true)
+    private Long memberId;
 }

--
Gitblit v1.9.1