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/MallOrderInfo.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
index 1950daa..e9d1bc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -3,6 +3,7 @@
 import cc.mrbird.febs.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -24,6 +25,8 @@
     private Date orderTime;
 
     private Date payTime;
+    //支付积分
+    private BigDecimal scoreAmount;
 
     private BigDecimal amount;
 
@@ -49,6 +52,7 @@
 
     private String phone;
 
+    private Long addressId;
     private String address;
 
     private String longitude;
@@ -80,4 +84,60 @@
     private Integer orderType;
 
     private BigDecimal carriage;
+
+    private Integer commentState;
+    /**
+     * 评价状态 1:待评价 2:已评价
+     */
+    public static final Integer COMMENT_STATE_NO = 1;
+    public static final Integer COMMENT_STATE_YES = 2;
+
+    //提货团长特征码
+    private String takeUniqueCode;
+    //提货码
+    private String takeCode;
+    //配送方式 1:自提 2:快递
+    private Integer deliveryType;
+
+    /**
+     * 自提点信息
+     */
+    @TableField(exist = false)
+    private String leaderName;
+    @TableField(exist = false)
+    private String leaderPhone;
+    @TableField(exist = false)
+    private String addressPic;
+    @TableField(exist = false)
+    private String addressArea;
+    @TableField(exist = false)
+    private String detailAddress;
+    @TableField(exist = false)
+    private Double leaderLongitude;
+    @TableField(exist = false)
+    private Double leaderLatitude;
+    /**
+     * 微信订单编号
+     */
+    private String wxOrderNo;
+    /**
+     * 配送状态 1:待配送 2:配送中 3:已送达
+     */
+    private Integer deliveryState;
+    /**
+     * 是否送货上门  1:是 2:否
+     */
+    private Integer isHome;
+    /**
+     * 是否开过发票 0:未开 1:已开
+     */
+    private Integer isInvoice;
+
+    @TableField(exist = false)
+    private String orderIds;
+
+    @TableField(exist = false)
+    private String expressNo;
+
+    private Integer isFree;
 }

--
Gitblit v1.9.1