From b49d65c9d5cb037b25668465a3e4b49cfa6f3f8f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Jun 2022 14:39:16 +0800
Subject: [PATCH] 20220528

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java |    6 ++++++
 1 files changed, 6 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..85130e9 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -63,7 +63,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;

--
Gitblit v1.9.1