From 8d76e801e612abb38123acc7edaccd24887a685b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 15 八月 2025 09:07:42 +0800
Subject: [PATCH] 根据韩月设计,去除参数实体类(Param)及相关逻辑代码,作物实体类的开始日期与结束日期属性改为月日型。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
index 5e4b6b1..72d5e4a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
@@ -130,20 +130,30 @@
         public Double remainMoney ; //鍓╀綑閲戦
 
         public void valueFrom(DataCd84Vo vo84, DataCd83OpenVo vo83Op, DataCd83CloseVo vo83Cl){
-            if(this.isAll0(this.icCardAddr)){
-                this.isVirIcCard = true ;
-            }else{
-                this.isVirIcCard = false ;
-            }
             if(vo84 != null){
+                if(this.isAll0(vo84.cardAddr)){
+                    this.isVirIcCard = true ;
+                }else{
+                    this.isVirIcCard = false ;
+                }
                 this.icCardAddr = vo84.cardAddr ;
                 this.icCardNo = vo84.cardNo ;
                 this.remainMoney = vo84.remainMoney ;
             }else if(vo83Op != null){
+                if(this.isAll0(vo83Op.icCardAddr)){
+                    this.isVirIcCard = true ;
+                }else{
+                    this.isVirIcCard = false ;
+                }
                 this.icCardAddr = vo83Op.icCardAddr ;
                 this.icCardNo = vo83Op.icCardNo ;
                 this.remainMoney = vo83Op.remainMoney ;
             }else if(vo83Cl != null){
+                if(this.isAll0(vo83Cl.icCardAddr)){
+                    this.isVirIcCard = true ;
+                }else{
+                    this.isVirIcCard = false ;
+                }
                 this.icCardAddr = vo83Cl.icCardAddr ;
                 this.icCardNo = vo83Cl.icCardNo ;
                 this.remainMoney = vo83Cl.remainMoney ;

--
Gitblit v1.8.0