From 1e567af8bbdda31ce3342cd41bb40157168b3da9 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
index 3891c18..ee47dc6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -84,14 +84,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鍒嗛挓") ;

--
Gitblit v1.8.0