zhubaomin
2024-11-01 28c008443bae86fe0b8acf79b06868e1dc78e709
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
1个文件已修改
20 ■■■■ 已修改文件
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.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(vo83Op.icCardAddr)){
                    this.isVirIcCard = true ;
                }else{
                    this.isVirIcCard = false ;
                }
                this.icCardAddr = vo83Cl.icCardAddr ;
                this.icCardNo = vo83Cl.icCardNo ;
                this.remainMoney = vo83Cl.remainMoney ;