diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index b80a1adba..425e4dd00 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -606,7 +606,7 @@ public class SpringBootTestController { orderInfo.setReason("充电异常中止，急停开入"); TransactionRecordsData data = TransactionRecordsData.builder() - .orderCode("88000000000001012212171045412218") + .transactionCode("88000000000001012212171045412218") .consumptionAmount(String.valueOf(0.00)) .stopReasonMsg(orderInfo.getReason()) .totalElectricity("0") diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java index 681c5b0e1..e7360e074 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java @@ -45,7 +45,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ // 交易流水号 byte[] orderCodeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); - String orderCode = BytesUtil.bcd2Str(orderCodeByteArr); + String transactionCode = BytesUtil.bcd2Str(orderCodeByteArr); // 桩编码 startIndex += length; @@ -86,13 +86,13 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) { // 启动失败 - orderBasicInfoService.chargingPileFailedToStart(orderCode, failedReasonMsg); + orderBasicInfoService.chargingPileFailedToStart(transactionCode, failedReasonMsg); } else { // 启动成功 - orderBasicInfoService.chargingPileStartedSuccessfully(orderCode); + orderBasicInfoService.chargingPileStartedSuccessfully(transactionCode); } // orderBasicInfoService.updateOrderBasicInfo(orderInfo); - log.info("交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果:{}, 失败原因:{}", orderCode, pileSn, connectorCode, startResult, failedReasonMsg); + log.info("交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果:{}, 失败原因:{}", transactionCode, pileSn, connectorCode, startResult, failedReasonMsg); return null; } } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 428ca1f4d..9b1688907 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -551,7 +551,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { } else { // 平台没有查到订单 orderBasicInfoService.saveAbnormalOrder(data); - log.warn("充电桩传来的交易记录，根据订单号:{}查询不到订单，判定为非法账单", orderCode); + log.warn("充电桩传来的交易记录，根据交易流水号:{}查询不到订单，判定为可疑账单", transactionCode); } } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4bfa561bc..b2a2ee596 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -239,12 +239,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 充电桩启动失败 * - * @param orderCode - * @param failedReasonMsg + * @param transactionCode 交易流水号 + * @param failedReasonMsg 失败原因 */ @Override - public void chargingPileFailedToStart(String orderCode, String failedReasonMsg) { - OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode); + public void chargingPileFailedToStart(String transactionCode, String failedReasonMsg) { + // OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode); + OrderBasicInfo orderInfo = getOrderInfoByTransactionCode(transactionCode); if (orderInfo == null) { return; } @@ -252,7 +253,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderInfo.setReason(failedReasonMsg); // 订单退款(结算订单) TransactionRecordsData data = TransactionRecordsData.builder() - .orderCode(orderInfo.getOrderCode()) + .transactionCode(orderInfo.getTransactionCode()) .consumptionAmount(String.valueOf(orderInfo.getOrderAmount())) .stopReasonMsg(failedReasonMsg) .totalElectricity(Constants.ZERO) @@ -267,11 +268,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 充电桩启动成功 * - * @param orderCode + * @param transactionCode */ @Override - public void chargingPileStartedSuccessfully(String orderCode) { - OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode); + public void chargingPileStartedSuccessfully(String transactionCode) { + // OrderBasicInfo orderInfo = getOrderInfoByOrderCode(orderCode); + OrderBasicInfo orderInfo = getOrderInfoByTransactionCode(transactionCode); if (orderInfo == null) { return; } @@ -445,7 +447,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { @Override public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) { logger.info("结算订单start data:{}, orderBasicInfo:{}", data.toString(), orderBasicInfo.toString()); - String orderCode = data.getOrderCode(); + String orderCode = orderBasicInfo.getOrderCode(); // 判断订单状态 if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) { @@ -510,13 +512,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { .subType(MemberWalletEnum.SUBTYPE_ORDER_SETTLEMENT_REFUND.getValue()) // 订单结算退款 .updatePrincipalBalance(returnPrincipal) .updateGiftBalance(returnGift) - .relatedOrderCode(orderCode) + .relatedOrderCode(orderBasicInfo.getOrderCode()) .build(); memberBasicInfoService.updateMemberBalance(updateMemberBalanceDTO); } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { // 微信支付 // 微信退款逻辑 WeChatRefundDTO weChatRefundDTO = new WeChatRefundDTO(); - weChatRefundDTO.setOrderCode(orderCode); + weChatRefundDTO.setOrderCode(orderBasicInfo.getOrderCode()); weChatRefundDTO.setRefundType("1"); weChatRefundDTO.setRefundAmount(residue); this.weChatRefund(weChatRefundDTO); @@ -541,7 +543,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 修改订单数据 // 查询订单详情 - OrderDetail orderDetail = getOrderDetailByOrderCode(orderCode); + OrderDetail orderDetail = getOrderDetailByOrderCode(orderBasicInfo.getOrderCode()); // 把交易记录中的用电量，金额等信息 更新到orderBasicInfo和orderDetail orderBasicInfo.setOrderAmount(orderAmount); // 订单总金额 @@ -595,7 +597,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { try { // uniApp 发送停止充电订阅消息 WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); - wechatSendMsgDTO.setOrderCode(orderCode); + wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); Map resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap)); } catch (Exception e) {