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/vo/AdminMallOrderInfoVo.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
index e3e6e31..6c4c3ec 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -16,8 +17,10 @@
private Long memberId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date payTime;
private BigDecimal amount;
@@ -25,6 +28,8 @@
private String payMethod;
private String payOrderNo;
+
+ private String payImage;
private String payResult;
@@ -61,5 +66,25 @@
private String memberPhone;
+ private String memberBindPhone;
+
private String memberEmail;
+
+ private BigDecimal carriage;
+
+ private BigDecimal goodsAmount;
+ //配送方式 1：自提 2：快递
+ private Integer deliveryType;
+
+ private String wxOrderNo;
+ //配送状态 1：待配送 2：配送中 3：已送达
+ private Integer deliveryState;
+ //是否送货上门 1：是 2：否
+ private Integer isHome;
+ //团长姓名
+ private String leaderName;
+ //商品名称
+ private String goodsName;
+
+ private String refererName;
}
--
Gitblit v1.9.1