yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改终端统计，放开订单结算短信通知

Browse Source
This commit is contained in:
yuyang 2022-04-25 09:18:00 +08:00
parent e6dcae2021
commit 1662362567
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -1201,24 +1201,24 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
public void run() { public void run() {
try{ try{
logger.info("<<<<<<<<<<<<<<<<进行入短信发送>>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<进行入短信发送>>>>>>>>>>>>>>>>>");
// if(!UserTypeUtil.INTERNET_TYPE.equals(source)){ if(!UserTypeUtil.INTERNET_TYPE.equals(source)){
// if(userMessage !=null && userMessage.get("phone") != null){ if(userMessage !=null && userMessage.get("phone") != null){
// if("1".equals(xhpcChargingPile.get("type").toString())){ if("1".equals(xhpcChargingPile.get("type").toString())){
// HashMap<String, String> paramMap = new HashMap<>(); HashMap<String, String> paramMap = new HashMap<>();
// paramMap.put("elec", xhpcChargeOrder.getEndSoc()); paramMap.put("elec", xhpcChargeOrder.getEndSoc());
// paramMap.put("sumMoney", balance.toString()); paramMap.put("sumMoney", balance.toString());
// paramMap.put("phone", userMessage.get("phone").toString()); paramMap.put("phone", userMessage.get("phone").toString());
// paramMap.put("content", "【小华停止充电】尊敬的用户，你的爱车已停止充电，电量为：" + xhpcChargeOrder.getEndSoc() + "%，总费用为：" + balance + "元，充电费用明细，请查询小华充电小程序，谢谢。"); paramMap.put("content", "【小华停止充电】尊敬的用户，你的爱车已停止充电，电量为：" + xhpcChargeOrder.getEndSoc() + "%，总费用为：" + balance + "元，充电费用明细，请查询小华充电小程序，谢谢。");
// smsService.sendNotice(paramMap); smsService.sendNotice(paramMap);
// }else { }else {
// HashMap<String, String> paramMap = new HashMap<>(); HashMap<String, String> paramMap = new HashMap<>();
// paramMap.put("sumMoney", balance.toString()); paramMap.put("sumMoney", balance.toString());
// paramMap.put("phone", userMessage.get("phone").toString()); paramMap.put("phone", userMessage.get("phone").toString());
// paramMap.put("content", "【小华停止充电】尊敬的用户，你的爱车已停止充电，总费用为：" + balance.toString() + "元，充电费用明细，请查询小华充电小程序，谢谢。"); paramMap.put("content", "【小华停止充电】尊敬的用户，你的爱车已停止充电，总费用为：" + balance.toString() + "元，充电费用明细，请查询小华充电小程序，谢谢。");
// smsService.sendNotice(paramMap); smsService.sendNotice(paramMap);
// } }
// } }
// } }
}catch (Exception e){ }catch (Exception e){
logger.info("<<<<<<<<<<<<<<<<发送短信失败>>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<发送短信失败>>>>>>>>>>>>>>>>>");
} }

5
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcStatisticsMapper.xml
View File

@ -434,7 +434,10 @@
terminal_id as terminalId, terminal_id as terminalId,
name as terminalName name as terminalName
from xhpc_terminal from xhpc_terminal
where 1=1 where del_flag =0
<if test="chargingStationId!=null">
and charging_station_id=#{chargingStationId}
</if>
<if test="type==1"> <if test="type==1">
and charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{userId}) and charging_station_id in (select charging_station_id from xhpc_charging_station where operator_id=#{userId})
</if> </if>