From 50777ea07aa3c5a405c26444ffeb87c6eb645617 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 28 Feb 2024 15:22:38 +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 --- .../impl/OrderBasicInfoServiceImpl.java | 20 +++++++++---------- .../DelayMerchantProgramLogic.java | 4 ++-- .../wxpay/service/WxAppletRemoteService.java | 11 ++++++++-- .../mapper/pile/OrderBasicInfoMapper.xml | 6 +++--- 4 files changed, 24 insertions(+), 17 deletions(-) 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 f70d4762e..5f75d8eba 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 @@ -1578,16 +1578,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { /** * uniApp 发送停止充电订阅消息 */ - private void sendMsg(OrderBasicInfo orderBasicInfo) { - try { - WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); - wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); - Map resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); - logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap)); - } catch (Exception e) { - logger.error("小程序发送充电停止推送消息 error", e); - } - } + // private void sendMsg(OrderBasicInfo orderBasicInfo) { + // try { + // WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); + // wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); + // Map resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); + // logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap)); + // } catch (Exception e) { + // logger.error("小程序发送充电停止推送消息 error", e); + // } + // } /** * 批量查询订单 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index f7c0107d8..5cead444f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -410,9 +410,9 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); Map resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); - logger.info("【{}】-小程序发送充电停止推送消息 result:{}", this.getClass().getSimpleName(), JSON.toJSONString(resultMap)); + logger.info("【{}】-小程序发送充电停止推送消息, orderCode:{}, result:{}", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), JSON.toJSONString(resultMap)); } catch (Exception e) { - logger.error("【{}】-小程序发送充电停止推送消息 error", this.getClass().getSimpleName(), e); + logger.error("【{}】-小程序发送充电停止推送消息, orderCode:{}, error", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), e); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java index 5bf77ef3e..ba6ac6d7b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java @@ -33,6 +33,7 @@ import java.text.ParseException; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Objects; @Service public class WxAppletRemoteService { @@ -210,7 +211,10 @@ public class WxAppletRemoteService { // 通过orderCode查询到充电站点和开始时间并set String orderCode = dto.getOrderCode(); SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(orderCode); - + if (Objects.isNull(sendMessageVO)) { + log.error("开始充电发送消息, 通过orderCode:{}, 查询SendMessageVO为null", dto.getOrderCode()); + return null; + } AppletTemplateMessageSendDTO.StartChargingMessage startChargingMessage = new AppletTemplateMessageSendDTO.StartChargingMessage(); msgInfo.setStartChargingMessage(startChargingMessage); if (StringUtils.isBlank(sendMessageVO.getChargeStartTime())) { @@ -241,7 +245,10 @@ public class WxAppletRemoteService { // 通过订单号查询订单金额 AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO(); SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(dto.getOrderCode()); - + if (Objects.isNull(sendMessageVO)) { + log.error("停止充电发送消息, 通过orderCode:{}, 查询SendMessageVO为null", dto.getOrderCode()); + return null; + } msgInfo.setType("2"); // 2-结束充电推送消息 msgInfo.setTouser(sendMessageVO.getOpenId()); // 封装对象并调用发送消息的方法 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index c746bbe67..52fe44da6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2467,9 +2467,9 @@ t3.total_used_electricity as chargingDegree, t4.open_id as openId FROM order_basic_info t1 - JOIN pile_station_info t2 ON t1.station_id = t2.id - join order_detail t3 on t1.order_code = t3.order_code - join member_basic_info t4 on t1.member_id = t4.member_id + JOIN pile_station_info t2 ON t1.station_id = t2.id + join order_detail t3 on t1.order_code = t3.order_code + join member_basic_info t4 on t1.member_id = t4.member_id where t1.del_flag = '0' and t1.order_code = #{orderCode,jdbcType=VARCHAR}