From a3daea7a022be8fde35b8c9af8aca7608f77624f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 Jan 2023 15:22:05 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 125fb8d..4e13297 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -30,6 +30,9 @@
@ApiModelProperty(value = "支付方式")
private String payMethod;
+ @ApiModelProperty(value = "物流编号")
+ private String payTradeNo;
+
@ApiModelProperty(value = "支付方式类型")
private Integer payMethodType;
@@ -63,7 +66,13 @@
@ApiModelProperty(value = "剩余时间")
private Long remainTime;
+ @ApiModelProperty(value = "运费")
+ private BigDecimal carriage;
+
public Integer getPayMethodType() {
+ if (this.payMethod == null) {
+ return 0;
+ }
switch (this.payMethod) {
case "微信支付" :
return 1;
@@ -75,5 +84,17 @@
return 3;
}
}
+
+ @ApiModelProperty(value = "评价状态 1：待评价 2：已评价")
+ private Integer commentState;
+
+ @ApiModelProperty(value = "配送方式 1：快递寄送2：到店自提")
+ private Integer deliverType;
+
+ @ApiModelProperty(value = "配送方式 1：快递寄送2：到店自提")
+ private BigDecimal subsidyAmount;
+
+ @ApiModelProperty(value = "门店信息")
+ private ApiShopApplyVo apiShopApplyVo;
}
--
Gitblit v1.9.1