From d0049dea01d9733eb7d5c2bea58325a64a1b642a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 04 十二月 2019 09:27:35 +0800
Subject: [PATCH] 品牌
---
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