From 8d38972b593b5ba698b0e605039ed8c795eaaef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 17:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 6a33fbc..e93d1af 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -113,9 +113,9 @@
Integer orderType = null;
if (StringUtil.isNullOrEmpty(type)) {
orderType = null;
- } else if ("0".equalsIgnoreCase(type)){
+ } else if (!"0".equalsIgnoreCase(type)){
orderType = Integer.parseInt(type);
- }
+ }
// 绛涢�夋椂闂�
if (slotTime != null) {
@@ -146,7 +146,7 @@
if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
- if (dateType == 4)
+ if (dateType != null && dateType == 4)
dateType = 5; // 鏂扮増鏌ヨ鏈湀鍒拌处
}
--
Gitblit v1.8.0