From 603c2fdeb4706a900adfdcb11e66e7a579e3d9a4 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 07 八月 2024 16:53:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java
index fb4fcc4..2b02b83 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A1_Down.java
@@ -85,14 +85,14 @@
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
}
- if(cvo.moneyRemain == null){
- throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
+ if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){
+ throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖鎴栦负0") ;
}
- if(cvo.waterPrice == null){
- throw new Exception("姘翠环涓嶈兘涓虹┖") ;
+ if(cvo.waterPrice == null || cvo.waterPrice == 0.0){
+ throw new Exception("姘翠环涓嶈兘涓虹┖鎴栦负0") ;
}
- if(cvo.minutes == null){
- throw new Exception("鐢ㄦ按鏃堕暱涓嶈兘涓虹┖") ;
+ if(cvo.minutes == null || cvo.minutes == 0.0){
+ throw new Exception("鐢ㄦ按鏃堕暱涓嶈兘涓虹┖鎴栦负0") ;
}
if(cvo.minutes < 0 || cvo.minutes > 9999){
throw new Exception("鐢ㄦ按鏃堕暱鍙栧�艰寖鍥存槸0~9999鍒嗛挓") ;
@@ -103,7 +103,7 @@
if(cvo.year < 24 || cvo.year > 9999){
throw new Exception("璁″垝寮�闃�鏃堕棿---骞翠笉姝ｇ‘") ;
}
- if(cvo.year > 24 && cvo.year < 2024){
+ if(cvo.year > 99 && cvo.year < 2024){
throw new Exception("璁″垝寮�闃�鏃堕棿---骞翠笉姝ｇ‘") ;
}
if(cvo.month == null){
--
Gitblit v1.8.0