From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index 41fa4ee..08cf033 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -37,8 +37,17 @@
@ApiModelProperty(value = "状态")
private Integer status;
+ @ApiModelProperty(value = "订单积分")
+ private BigDecimal scoreAmount;
+
@ApiModelProperty(value = "订单金额")
private BigDecimal amount;
+
+ @ApiModelProperty(value = "送货上门经度")
+ private Double longitude;
+
+ @ApiModelProperty(value = "送货上门纬度")
+ private Double latitude;
@ApiModelProperty(value = "收货人姓名")
private String name;
@@ -67,6 +76,9 @@
@ApiModelProperty(value = "运费")
private BigDecimal carriage;
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
public Integer getPayMethodType() {
if (this.payMethod == null) {
return 0;
@@ -91,9 +103,9 @@
/**
* 自提点信息
*/
- @ApiModelProperty(value = "团长姓名")
+ @ApiModelProperty(value = "自提点联系人姓名")
private String leaderName;
- @ApiModelProperty(value = "团长电话")
+ @ApiModelProperty(value = "自提点联系人电话")
private String leaderPhone;
@ApiModelProperty(value = "自提点图片")
private String addressPic;
@@ -115,5 +127,8 @@
private Integer deliveryState;
@ApiModelProperty(value = "是否送货上门 1：是 2：否")
private Integer isHome;
+
+ @ApiModelProperty(value = "是否赠送 1-是 2-否")
+ private Integer isFree;
}
--
Gitblit v1.9.1