From cb7752815bae562e6692de7b138d2742c9b23df3 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 12 Jun 2024 09:56:26 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 2 ++ .../pile/service/impl/PileMsgRecordServiceImpl.java | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 6aed88040..abe56659c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -688,6 +688,8 @@ public class OrderService { Map resultMap = Maps.newHashMap(); resultMap.put("status", status); resultMap.put("reason", reason); + resultMap.put("orderCode", orderInfo.getOrderCode()); + resultMap.put("pileConnectorCode", orderInfo.getPileConnectorCode()); return resultMap; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 93be2c4ec..c9c291fb7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -197,14 +197,13 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { private String transactionRecordMsg(String jsonMsg) { JSONObject jsonObject = JSONObject.parseObject(jsonMsg); - - // 订单号 - String orderCode = jsonObject.getString("orderCode"); - // 交易流水号 String transactionCode = jsonObject.getString("transactionCode"); OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); + // 订单号 + String orderCode = orderBasicInfo.getOrderCode(); + // 充电度数 String totalElectricity = jsonObject.getString("totalElectricity");