diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java index 6703bd048..d76ac38ff 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java @@ -64,7 +64,7 @@ public class SettlementUploadHandler extends AbstractEBikeHandler { EBikeMessageCmd03.SettlementInfo settlementInfo = message.getSettlementInfo(); log.info("结算消费信息上传:{}", JSON.toJSONString(message)); - int transactionCode = settlementInfo.getOrderNumber(); + String transactionCode = settlementInfo.getOrderNumber(); // 处理订单加锁/结算电单车订单 String lockKey = "settle_order_" + transactionCode; String uuid = IdUtils.fastUUID(); @@ -91,7 +91,7 @@ public class SettlementUploadHandler extends AbstractEBikeHandler { */ private void processOrder(EBikeMessageCmd03 message) { EBikeMessageCmd03.SettlementInfo settlementInfo = message.getSettlementInfo(); - String transactionCode = settlementInfo.getOrderNumber() + ""; + String transactionCode = settlementInfo.getOrderNumber(); // 根据交易流水号查询订单信息 OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); if (orderBasicInfo != null) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java index bbcb2c215..3693c3a60 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ebike/deviceupload/EBikeMessageCmd03.java @@ -41,7 +41,7 @@ public class EBikeMessageCmd03 extends AbsEBikeMessage { private int startMode; // 在线/离线启动/验证码 private int cardNumberOrVerificationCode; // 卡号/验证码 private int stopReason; // 停止原因 - private int orderNumber; // 订单编号 + private String orderNumber; // 订单编号 private int secondMaxPower; // 第二最大功率 // private String timestamp; // 时间戳 上发指令当时的时间,有时候不准确,该字段属于调试使用,服务器无需关心此字段 // private String placeholderDuration; // 占位时长 充电柜专用,其他设备忽略此字段 表示充满后占用设备的时长,单位为分钟 @@ -54,7 +54,7 @@ public class EBikeMessageCmd03 extends AbsEBikeMessage { this.startMode = BytesUtil.bytesToIntLittle(new byte[]{dataBytes[7]}); this.cardNumberOrVerificationCode = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 8, 12)); this.stopReason = BytesUtil.bytesToIntLittle(new byte[]{dataBytes[12]}); - this.orderNumber = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 13, 29)); + this.orderNumber = BytesUtil.bcd2Str(Arrays.copyOfRange(dataBytes, 13, 29)); this.secondMaxPower = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 29, 31)); // this.timestamp = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 31, 35)) + ""; // this.placeholderDuration = BytesUtil.bytesToIntLittle(Arrays.copyOfRange(dataBytes, 35, 37)) + "";