From 75d8b0ad39a7eb04f72ef8654dbb895322f07cfd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Oct 2025 13:41:42 +0800
Subject: [PATCH] feat(ai): 新增会员答题分页及详情查询功能 - 在 AiMemberAnswerMapper 中新增 getAnswerPage 方法及对应 XML 查询语句 - 新增 ApiMemberAnswerPageDto 和 ApiMemberAnswerPageVo 用于分页查询参数和返回结果 - 在 AiMemberAnswerService 及其实现类中添加 getAnswerPage 方法 - 在 AiMemberService 及其实现类中新增 answerPage 和 answerInfo 接口实现 - 新增 ApiMemberAnswerInfoDto 和 ApiMemberAnswerInfoVo 用于答题详情接口参数和响应 - 在 ApiMemberController 中增加 /answerPage 和 /answerInfo两个 POST 接口 - 优化 AiMemberTeamPracticeVo，增加 memberUuid 字段 - 统一导入包路径，简化代码结构
---
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 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 48b1f23..e9d1bc5 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -1,11 +1,14 @@
package cc.mrbird.febs.mall.entity;
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;
import java.util.Date;
+import java.util.List;
/**
* @author wzy
@@ -22,10 +25,16 @@
private Date orderTime;
private Date payTime;
+ //支付积分
+ private BigDecimal scoreAmount;
private BigDecimal amount;
private String payMethod;
+
+ private String payOrderNo;
+
+ private String payResult;
/**
* 状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消
@@ -36,11 +45,14 @@
* 取消类型 1-超时未支付2-主动取消
*/
private Integer cancelType;
+ public static final Integer CANCEL_OVERTIME_NO_PAY = 1;
+ public static final Integer CANCEL_BY_SELF = 2;
private String name;
private String phone;
+ private Long addressId;
private String address;
private String longitude;
@@ -48,4 +60,84 @@
private String latitude;
private String remark;
+
+ /**
+ * 是否删除 1-是 2-否
+ */
+ private Integer delFlag;
+
+ /**
+ * 确认收货时间
+ */
+ private Date receivingTime;
+
+ @TableField(exist = false)
+ private List<MallOrderItem> items;
+
+ private String payImage;
+
+ private String payTradeNo;
+
+ /**
+ * 订单类型 1-普通订单 2-积分订单
+ */
+ 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