From c690f01658a81a8b843fbacd9405e83d83c9aee3 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 23 Apr 2023 17:11:31 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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 f18c329..f3b18a8 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,10 +24,14 @@
private String orderNo;
@ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date orderTime;
@ApiModelProperty(value = "支付方式")
private String payMethod;
+
+ @ApiModelProperty(value = "支付方式类型")
+ private Integer payMethodType;
@ApiModelProperty(value = "状态")
private Integer status;
@@ -54,4 +59,42 @@
@ApiModelProperty(value = "订单退款信息")
private OrderRefundVo orderRefund;
+
+ @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;
+ case "支付宝支付" :
+ return 2;
+ case "积分支付" :
+ return 3;
+ default:
+ return 3;
+ }
+ }
+
+ @ApiModelProperty(value = "评价状态 1：待评价 2：已评价")
+ private Integer commentState;
+
+ @ApiModelProperty(value = "配送方式 1：快递寄送2：到店自提")
+ private Integer deliverType;
+
+ @ApiModelProperty(value = "门店信息")
+ private ApiShopApplyVo apiShopApplyVo;
+
+ @ApiModelProperty(value = "积分折扣金额")
+ private BigDecimal scoreAmount;
+
+ @ApiModelProperty(value = "积分数量")
+ private BigDecimal scoreCnt;
}
+
--
Gitblit v1.9.1