From 9f7670cbdcf4c28e47c58337bf8410475f27527d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 05 八月 2024 17:05:00 +0800
Subject: [PATCH] 完善代码.

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

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
index 29efc43..fd0e57f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A0_Down.java
@@ -79,7 +79,7 @@
         String json = obj.toJSONString();
         ComA0Vo cvo = JSON.parseObject(json, ComA0Vo.class) ;
         if(cvo == null){
-            throw new Exception("json杞珻om97Vo涓簄ull") ;
+            throw new Exception("json杞珻omA0Vo涓簄ull") ;
         }
         if(cvo.icCardNo == null){
             throw new Exception("铏氭嫙IC鍗$紪鍙蜂笉鑳戒负绌�") ;
@@ -101,12 +101,14 @@
         //if(icCardNoGrp[0] != null){
         //    midRs.param = icCardNoGrp[0] ;
         //}
+        //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
         byte[] bs = new byte[16] ;
         index = 0 ;
-        //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
         GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+        bytes = ByteUtil.bytesMerge(bsHead, bs) ;
 
-        index += 5 ;
+        bs = new byte[4] ;
+        index = 0 ;
         Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
         byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
         int bTempLen = bTemp.length ;
@@ -121,7 +123,10 @@
         for(; count < 4; count++){
             bs[index++] = 0 ;
         }
+        bytes = ByteUtil.bytesMerge(bytes, bs) ;
 
+        bs = new byte[2] ;
+        index = 0 ;
         Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
         bTemp = ByteUtil.int2BCD_LE(price) ;
         bTempLen = bTemp.length ;
@@ -136,8 +141,11 @@
         for(; count < 2; count++){
             bs[index++] = 0 ;
         }
+        bytes = ByteUtil.bytesMerge(bytes, bs) ;
 
 
+        bs = new byte[2] ;
+        index = 0 ;
         bTemp = ByteUtil.int2BCD_LE(cvo.waterAmount) ;
         bTempLen = bTemp.length ;
         count = 0 ;
@@ -151,8 +159,7 @@
         for(; count < 2; count++){
             bs[index++] = 0 ;
         }
-
-        bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+        bytes = ByteUtil.bytesMerge(bytes, bs) ;
 
         GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
 

--
Gitblit v1.8.0