From 2fcfbcefee1a6ad5b51e23223ebe77093b847c3a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 14:45:53 +0800
Subject: [PATCH] feat(ai):优化对话流初始化逻辑 - 调整对话记录查询顺序,确保获取最新进行中的对话 - 在对话不存在时创建新对话并初始化问题 - 若对话已存在,则查询最近的对话项作为标题来源 - 修复可能因查询顺序导致的标题加载异常问题
---
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 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 369b65b..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;
@@ -26,11 +31,6 @@
private String thumb;
- /**
- * ALTER TABLE `mall_goods`
- * DROP COLUMN `goods_parameter`,
- * ADD COLUMN `goods_parameter` text NULL COMMENT '商品参数' AFTER `thumb`;
- */
private String goodsParameter;
private String goodsDetails;
@@ -52,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;
/**
@@ -63,6 +68,9 @@
* 静态占比
*/
private BigDecimal staticProp;
+
+ @TableField(exist = false)
+ private BigDecimal staticPropPrice;
/**
* 是否多规则 1-是 2-否
@@ -111,8 +119,30 @@
@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