From 2c74d176be9d103bf47f69868ca7975a3a73256d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 12:34:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 3 +++
1 files changed, 3 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..954534b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -64,6 +64,9 @@
private Long remainTime;
public Integer getPayMethodType() {
+ if (this.payMethod == null) {
+ return 0;
+ }
switch (this.payMethod) {
case "微信支付" :
return 1;
--
Gitblit v1.9.1