From 70d7a48cef4ebe004eb2ca411de4667e3d30f1ac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 09 八月 2024 15:38:49 +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_99_Down.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 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 d7ff9b7..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
@@ -79,34 +79,38 @@
String json = obj.toJSONString();
Com99Vo cvo = JSON.parseObject(json, Com99Vo.class) ;
if(cvo == null){
- throw new Exception("json杞珻om97Vo涓簄ull") ;
+ throw new Exception("json杞珻om99Vo涓簄ull") ;
}
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鍒嗛挓") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
+ //byte[] bs = new byte[13] ;
+ //index = 0 ;
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ byte[] bs = new byte[8] ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- byte[] bs = new byte[13] ;
+
+ bs = new byte[4] ;
index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
-
- index += 5 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
@@ -121,7 +125,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 +143,11 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
bTemp = ByteUtil.int2BCD_LE(cvo.minutes) ;
bTempLen = bTemp.length ;
count = 0 ;
@@ -151,8 +161,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