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

---
 src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
index c582ae4..ef7b6e2 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -16,6 +16,11 @@
 @TableName("mall_goods")
 public class MallGoods extends BaseEntity {
 
+
+    private String storeAppId;
+
+    private String storeGoodsId;
+
     private String goodsNo;
 
     private String goodsName;
@@ -25,6 +30,8 @@
     private String unit;
 
     private String thumb;
+
+    private String goodsParameter;
 
     private String goodsDetails;
 
@@ -45,6 +52,11 @@
 
     private Long categoryId;
 
+    /**
+     * 是否热卖  1:是  2:否
+     */
+    public static final Integer ISHOT_STATE_YES = 1;
+    public static final Integer ISHOT_STATE_NO = 2;
     private Integer isHot;
 
     /**
@@ -56,6 +68,9 @@
      * 静态占比
      */
     private BigDecimal staticProp;
+
+    @TableField(exist = false)
+    private BigDecimal staticPropPrice;
 
     /**
      * 是否多规则 1-是 2-否
@@ -96,5 +111,38 @@
     private List<MallGoodsStyle> styles;
 
     @TableField(exist = false)
+    private List<MallGoodsSku> skus;
+
+    @TableField(exist = false)
     private List<String> images;
+
+    @TableField(exist = false)
+    private String orderNo;
+
+    @TableField(exist = false)
+    private Integer hasCollect;
+
+    private Integer hasCarriage;
+
+    private BigDecimal carriage;
+
+    private String wxCodeImg;
+    //运费方式  (1:固定运费 2:运费模板)
+    private Integer carriageType;
+    //运费金额
+    private BigDecimal carriageAmount;
+    //运费模板ID
+    private Long carriageRuleId;
+    //重量
+    private BigDecimal goodsWeight;
+    //序号
+    private Integer orderNumber;
+    private BigDecimal levelOnePrice;
+    private BigDecimal levelTwoPrice;
+    private BigDecimal levelThreePrice;
+
+
+    @TableField(exist = false)
+    private List<Long> couponIds;
+
 }

--
Gitblit v1.9.1