From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 cef66a2..e9d1bc5 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;
 
@@ -107,12 +109,6 @@
     @TableField(exist = false)
     private String addressPic;
     @TableField(exist = false)
-    private String province;
-    @TableField(exist = false)
-    private String city;
-    @TableField(exist = false)
-    private String township;
-    @TableField(exist = false)
     private String addressArea;
     @TableField(exist = false)
     private String detailAddress;
@@ -132,7 +128,16 @@
      * 是否送货上门  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