修改防止订单不生成
This commit is contained in:
yuyang
parent
8ef88e78ce
commit
5f87907a80
@ -72,6 +72,11 @@ public class XhpcPileOrderController extends BaseController {
|
||||
//解析订单编号
|
||||
Long userId =0L;
|
||||
Integer code =200;
|
||||
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
|
||||
if(xhpcChargeOrder==null|| xhpcChargeOrder.getUserId()==null){
|
||||
logger.info("桩启动回调接口--无效订单号>>>>>orderNo：" + orderNo);
|
||||
return R.fail(500,"无效订单号");
|
||||
}
|
||||
if (status == 1) {
|
||||
userId = update(0, remark, orderNo, 0);
|
||||
} else {
|
||||
@ -85,7 +90,6 @@ public class XhpcPileOrderController extends BaseController {
|
||||
JSONObject json = new JSONObject(map);
|
||||
logger.info("桩启动回调接口>>>>>json："+json.toString());
|
||||
//消息对了内容
|
||||
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
|
||||
if(xhpcChargeOrder.getSource()==0){
|
||||
webSocketService.getMessage(userId+"",json.toString());
|
||||
}
|
||||
@ -113,6 +117,11 @@ public class XhpcPileOrderController extends BaseController {
|
||||
map.put("userId", userId);
|
||||
}
|
||||
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
|
||||
if(xhpcChargeOrder==null|| xhpcChargeOrder.getUserId()==null){
|
||||
logger.info("桩停止回调接口--无效订单号>>>>>orderNo：" + orderNo);
|
||||
return R.fail(500,"无效订单号");
|
||||
}
|
||||
|
||||
if (status == 1) {
|
||||
xhpcChargeOrder.setStatus(0);
|
||||
map.put("message", "停止充电成功");
|
||||
@ -192,9 +201,9 @@ public class XhpcPileOrderController extends BaseController {
|
||||
|
||||
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
|
||||
if(xhpcChargeOrder==null|| xhpcChargeOrder.getUserId()==null){
|
||||
logger.info("桩实时数据回调接口--无效订单号>>>>>orderNo：" + orderNo);
|
||||
return R.fail(500,"无效订单号");
|
||||
}
|
||||
|
||||
Long userId = xhpcChargeOrder.getUserId();
|
||||
try {
|
||||
Date date = new Date();
|
||||
@ -457,6 +466,10 @@ public class XhpcPileOrderController extends BaseController {
|
||||
|
||||
//获取实时订单
|
||||
XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo);
|
||||
if(xhpcChargeOrder==null|| xhpcChargeOrder.getUserId()==null){
|
||||
logger.info("订单异常回调接口--无效订单号>>>>>orderNo：" + orderNo);
|
||||
return R.fail(500,"无效订单号");
|
||||
}
|
||||
Integer source = xhpcChargeOrder.getSource();
|
||||
String tenantId = xhpcChargeOrder.getTenantId();
|
||||
if(!UserTypeUtil.INTERNET_TYPE.equals(source)){
|
||||
|
||||
@ -35,6 +35,8 @@ import javax.annotation.PostConstruct;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@ -64,9 +66,9 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
@Autowired
|
||||
private IXhpcRealTimeOrderService xhpcRealTimeOrderService;
|
||||
|
||||
private final ExecutorService executorService = Executors.newFixedThreadPool(40);
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(XhpcChargeOrderServiceImpl.class);
|
||||
//队列名称
|
||||
private final static String NAME = "webSocket";
|
||||
|
||||
@PostConstruct
|
||||
public void init(){
|
||||
@ -123,7 +125,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
@Override
|
||||
@Transactional
|
||||
public AjaxResult startUp(HttpServletRequest request, Long userId, String terminalSerialNumber, Integer type) {
|
||||
|
||||
try{
|
||||
LoginUser loginUser = tokenService.getLoginUser(request);
|
||||
if (StringUtils.isNotNull(loginUser)) {
|
||||
String username = loginUser.getUsername();
|
||||
@ -207,10 +209,8 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<终端编号>>>>>>>>>>>>>>>>");
|
||||
//余额
|
||||
String balance = new BigDecimal(userMessage.get("balance").toString()).multiply(new BigDecimal(100)).toString();
|
||||
|
||||
//获取桩信息
|
||||
Map<String, Object> xhpcChargingPileById =xhpcChargeOrderMapper.getXhpcChargingPileById(xhpcTerminal.getChargingPileId(),tenantId);
|
||||
|
||||
//启动充电
|
||||
StartChargingData startChargingData = new StartChargingData();
|
||||
//订单流水号 终端号+年月日时分秒+自增4位 共32位
|
||||
@ -228,7 +228,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
}else{
|
||||
startChargingData.setVersion("0A");
|
||||
}
|
||||
|
||||
//用户、桩、平台（最小的）
|
||||
int number =0;
|
||||
if(!"".equals(userMessage.get("socUser")) && userMessage.get("socUser") !=null && userMessage.get("socProtect") !=null && !"0".equals(userMessage.get("socProtect").toString())){
|
||||
@ -260,7 +259,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
}
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<number>>>>>>>>>>>>>>>>>:"+number);
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<Soc>>>>>>>>>>>>>>>>>:"+startChargingData.getSoc());
|
||||
|
||||
//创建充电订单(充电启动soc初始值，结束是获取,并修改状态)
|
||||
XhpcChargeOrder xhpcChargeOrder = new XhpcChargeOrder();
|
||||
xhpcChargeOrder.setChargingStationId(xhpcTerminal.getChargingStationId());
|
||||
@ -283,26 +281,39 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
xhpcChargeOrder.setType(40);
|
||||
xhpcChargeOrderMapper.addXhpcChargeOrder(xhpcChargeOrder);
|
||||
|
||||
executorService.execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
R r1 = powerPileService.startCharging(startChargingData);
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<充电返回>>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getCode() + ">>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getMsg() + ">>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getData() + ">>>>>>>>>>>>>>>>>");
|
||||
if (r1.getCode() != 200) {
|
||||
return AjaxResult.error(r1.getMsg());
|
||||
}
|
||||
if(r1.getCode() == 200){
|
||||
try{
|
||||
xhpcChargeOrder.setRateModelId(Long.valueOf(r1.getData().toString()));
|
||||
xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder);
|
||||
//插一帧实时数据
|
||||
extracted(xhpcChargeOrder);
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
logger.error("update order[{}] failed.", orderNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
logger.info("<<<<<<<<<1111<<<<<<<<<<<<<<<C端订单号>>>>>>>>>>>>>>>>>:" + orderNo+"用户id:"+userId);
|
||||
logger.info("<<<<<<<<<2222<<<<<<<<<<<<<<<C端订单号>>>>>>>>>>>>>>>>>:" + orderNo+"用户id:"+userId);
|
||||
logger.info("<<<<<<<<<3333<<<<<<<<<<<<<<<C端订单号>>>>>>>>>>>>>>>>>:" + orderNo+"用户id:"+userId);
|
||||
logger.info("<<<<<<<<<4444<<<<<<<<<<<<<<<C端订单号>>>>>>>>>>>>>>>>>:" + orderNo+"用户id:"+userId);
|
||||
return AjaxResult.success();
|
||||
}else{
|
||||
return AjaxResult.error(UserTypeUtil.LOGIN_TYPE, "请重新登录");
|
||||
}
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return AjaxResult.error(UserTypeUtil.LOGIN_TYPE, "请重新登录");
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -583,20 +594,26 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
int res = xhpcChargeOrderMapper.addXhpcChargeOrder(xhpcChargeOrder);
|
||||
//int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status,
|
||||
// date,null, terminalId, power, chargingStationId, chargingMode, 1, userId);
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
|
||||
|
||||
executorService.execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
R r1 = powerPileService.startCharging(startChargingData);
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<第三方充电返回>>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getCode() + ">>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getMsg() + ">>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<" + r1.getData() + ">>>>>>>>>>>>>>>>>");
|
||||
logger.info("<<<<<<<<<<<<<<<<<<<<<<<<第三方充电返回>>>>>>>>>>>>>>>>>");
|
||||
try {
|
||||
Long rateModelId = Long.valueOf(r1.getData().toString());
|
||||
xhpcChargeOrder.setRateModelId(rateModelId);
|
||||
xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error("update order[{}] failed.", orderNo);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
logger.info("<<<<<<<<<1111<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
|
||||
logger.info("<<<<<<<<<2222<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
|
||||
logger.info("<<<<<<<<<3333<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
|
||||
logger.info("<<<<<<<<<4444<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
|
||||
Map<String, Object> data = new HashMap<>();
|
||||
data.put("startTime", startTime);
|
||||
data.put("orderNo", orderNo);
|
||||
@ -609,7 +626,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
|
||||
r.setMsg("内部服务调用错误");
|
||||
}
|
||||
return r;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -211,7 +211,8 @@
|
||||
<select id="userSum" resultType="map">
|
||||
select
|
||||
count(xau.app_user_id) userSum,
|
||||
(select count(DISTINCT user_id) from xhpc_charge_order where create_time >= #{time} and tenant_id =#{tenantId}) userVitality
|
||||
(select count(DISTINCT user_id) from xhpc_charge_order where create_time >= #{time} and tenant_id =#{tenantId}) userVitality,
|
||||
sum(xau.balance) balance
|
||||
from xhpc_app_user xau where 1=1
|
||||
<if test="phone != null and phone != ''">
|
||||
and xau.phone like concat('%', #{phone}, '%')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user