From 38d547d91d7eee81ed56ca6ceba7fd393952a082 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:12:15 +0800
Subject: [PATCH] feat(sign): 增加签到获得会员经验或积分的功能 - 在 ApiSignVo 中添加 mostSignIn 字段,用于区分签到获得的类型 - 在 ScoreFlowTypeEnum 中新增 SIGN_EXPERIENCE 和 SIGN_SCORE 类型 - 修改 ScoreServiceImpl 中的签到逻辑,支持获得会员经验和积分 - 更新 ScoreSettingDto,添加 mostSignIn 字段用于配置签到获得类型 - 在前端设置页面添加签到获得类型的选项

---
 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 72b0f24..28650b8 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java
@@ -25,6 +25,8 @@
     private Date orderTime;
 
     private Date payTime;
+    //支付积分
+    private BigDecimal scoreAmount;
 
     private BigDecimal amount;
 
@@ -50,6 +52,7 @@
 
     private String phone;
 
+    private Long addressId;
     private String address;
 
     private String longitude;
@@ -115,10 +118,32 @@
     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