autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-14 23:08:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-02-28 15:27:55 +08:00
parent afdedd0d7b 50777ea07a
commit a7f31a23d2
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1578,16 +1578,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
/** /**
* uniApp 发送停止充电订阅消息 * uniApp 发送停止充电订阅消息
*/ */
private void sendMsg(OrderBasicInfo orderBasicInfo) { // private void sendMsg(OrderBasicInfo orderBasicInfo) {
try { // try {
WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); // WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO();
wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); // wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode());
Map<String, String> resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); // Map<String, String> resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO);
logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap)); // logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap));
} catch (Exception e) { // } catch (Exception e) {
logger.error("小程序发送充电停止推送消息 error", e); // logger.error("小程序发送充电停止推送消息 error", e);
} // }
} // }
/** /**
* 批量查询订单 * 批量查询订单

4
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -410,9 +410,9 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO(); WechatSendMsgDTO wechatSendMsgDTO = new WechatSendMsgDTO();
wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode()); wechatSendMsgDTO.setOrderCode(orderBasicInfo.getOrderCode());
Map<String, String> resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); Map<String, String> 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) { } catch (Exception e) {
logger.error("【{}】-小程序发送充电停止推送消息 error", this.getClass().getSimpleName(), e); logger.error("【{}】-小程序发送充电停止推送消息, orderCode:{}, error", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), e);
} }
} }

11
jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
View File

@@ -33,6 +33,7 @@ import java.text.ParseException;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
@Service @Service
public class WxAppletRemoteService { public class WxAppletRemoteService {
@@ -210,7 +211,10 @@ public class WxAppletRemoteService {
// 通过orderCode查询到充电站点和开始时间并set // 通过orderCode查询到充电站点和开始时间并set
String orderCode = dto.getOrderCode(); String orderCode = dto.getOrderCode();
SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(orderCode); SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(orderCode);
if (Objects.isNull(sendMessageVO)) {
log.error("开始充电发送消息, 通过orderCode:{}, 查询SendMessageVO为null", dto.getOrderCode());
return null;
}
AppletTemplateMessageSendDTO.StartChargingMessage startChargingMessage = new AppletTemplateMessageSendDTO.StartChargingMessage(); AppletTemplateMessageSendDTO.StartChargingMessage startChargingMessage = new AppletTemplateMessageSendDTO.StartChargingMessage();
msgInfo.setStartChargingMessage(startChargingMessage); msgInfo.setStartChargingMessage(startChargingMessage);
if (StringUtils.isBlank(sendMessageVO.getChargeStartTime())) { if (StringUtils.isBlank(sendMessageVO.getChargeStartTime())) {
@@ -241,7 +245,10 @@ public class WxAppletRemoteService {
// 通过订单号查询订单金额 // 通过订单号查询订单金额
AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO(); AppletTemplateMessageSendDTO msgInfo = new AppletTemplateMessageSendDTO();
SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(dto.getOrderCode()); SendMessageVO sendMessageVO = orderBasicInfoService.selectOrderInfoByOrderCode(dto.getOrderCode());
if (Objects.isNull(sendMessageVO)) {
log.error("停止充电发送消息, 通过orderCode:{}, 查询SendMessageVO为null", dto.getOrderCode());
return null;
}
msgInfo.setType("2"); // 2-结束充电推送消息 msgInfo.setType("2"); // 2-结束充电推送消息
msgInfo.setTouser(sendMessageVO.getOpenId()); msgInfo.setTouser(sendMessageVO.getOpenId());
// 封装对象并调用发送消息的方法 // 封装对象并调用发送消息的方法

6
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -2467,9 +2467,9 @@
t3.total_used_electricity as chargingDegree, t3.total_used_electricity as chargingDegree,
t4.open_id as openId t4.open_id as openId
FROM order_basic_info t1 FROM order_basic_info t1
JOIN pile_station_info t2 ON t1.station_id = t2.id JOIN pile_station_info t2 ON t1.station_id = t2.id
join order_detail t3 on t1.order_code = t3.order_code join order_detail t3 on t1.order_code = t3.order_code
join member_basic_info t4 on t1.member_id = t4.member_id join member_basic_info t4 on t1.member_id = t4.member_id
where t1.del_flag = '0' where t1.del_flag = '0'
and t1.order_code = #{orderCode,jdbcType=VARCHAR} and t1.order_code = #{orderCode,jdbcType=VARCHAR}
</select> </select>