空订单写入tenant id

This commit is contained in:
zz 2022-04-12 11:13:41 +08:00
parent 256c590f8c
commit 54144c8629

View File

@ -1,9 +1,11 @@
package com.xhpc.evcs.api; package com.xhpc.evcs.api;
import cn.hutool.core.collection.CollUtil;
import com.xhpc.common.api.PileOrderService; import com.xhpc.common.api.PileOrderService;
import com.xhpc.common.core.domain.R; import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.utils.DateUtils; import com.xhpc.common.core.utils.DateUtils;
import com.xhpc.evcs.domain.EtOrderMapping; import com.xhpc.evcs.domain.EtOrderMapping;
import com.xhpc.evcs.domain.XhpcChargingStation;
import com.xhpc.evcs.dto.CommonRequest; import com.xhpc.evcs.dto.CommonRequest;
import com.xhpc.evcs.dto.CommonResponse; import com.xhpc.evcs.dto.CommonResponse;
import com.xhpc.evcs.dto.StartChargeRequest; import com.xhpc.evcs.dto.StartChargeRequest;
@ -13,6 +15,7 @@ import com.xhpc.evcs.jpa.*;
import com.xhpc.evcs.utils.JSONUtil; import com.xhpc.evcs.utils.JSONUtil;
import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.domain.XhpcHistoryOrder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Example;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -39,6 +42,8 @@ public class QueryStartChargeController {
private PileOrderService pileOrderService; private PileOrderService pileOrderService;
@Autowired @Autowired
private XhpcInternetUserRepository xhpcInternetUserRepository; private XhpcInternetUserRepository xhpcInternetUserRepository;
@Autowired
private XhpcChargingStationRepository xhpcChargingStationRepository;
@PostMapping(value = "/v1/query_start_charge") @PostMapping(value = "/v1/query_start_charge")
public CommonResponse queryStartCharge(@RequestBody CommonRequest<StartChargeRequest> commonRequest) throws Exception { public CommonResponse queryStartCharge(@RequestBody CommonRequest<StartChargeRequest> commonRequest) throws Exception {
@ -121,27 +126,35 @@ public class QueryStartChargeController {
private void emptyHorder(String startChargeSeq, String connectorId, EtOrderMapping etOrderMapping) { private void emptyHorder(String startChargeSeq, String connectorId, EtOrderMapping etOrderMapping) {
XhpcHistoryOrder emptyHorder = new XhpcHistoryOrder(); XhpcChargingStation stationExample = new XhpcChargingStation();
Date now = DateUtils.getNowDate(); final Long stationId = REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "stationId");
emptyHorder.setStartTime(now); stationExample.setId(stationId);
emptyHorder.setEndTime(now); Example<XhpcChargingStation> example = Example.of(stationExample);
emptyHorder.setCreateTime(now); XhpcChargingStation xhpcChargingStation = xhpcChargingStationRepository.findOne(example).orElse(null);
emptyHorder.setUpdateTime(now); if (xhpcChargingStation != null) {
emptyHorder.setStopReasonEvcs(9); XhpcHistoryOrder emptyHorder = new XhpcHistoryOrder();
String sn = genOrder(connectorId); emptyHorder.setTenantId(xhpcChargingStation.getTenantId());
etOrderMapping.setXhOrderNo(sn); Date now = DateUtils.getNowDate();
emptyHorder.setSerialNumber(sn); emptyHorder.setStartTime(now);
emptyHorder.setInternetSerialNumber(startChargeSeq); emptyHorder.setEndTime(now);
String operatorId3rdpty = startChargeSeq.substring(0, 9); emptyHorder.setCreateTime(now);
emptyHorder.setOperatorId3rdptyEvcs(operatorId3rdpty); emptyHorder.setUpdateTime(now);
emptyHorder.setUserId(xhpcInternetUserRepository.queryDbId(operatorId3rdpty)); emptyHorder.setStopReasonEvcs(9);
emptyHorder.setType(1); String sn = genOrder(connectorId);
emptyHorder.setSource(1); etOrderMapping.setXhOrderNo(sn);
emptyHorder.setState(-1); emptyHorder.setSerialNumber(sn);
emptyHorder.setChargingStationId(REDIS.getCacheMapValue("pile:".concat(connectorId.substring(0, 14)), "stationId")); emptyHorder.setInternetSerialNumber(startChargeSeq);
emptyHorder.setTerminalId(xhpcTerminalRepository.queryDbId(connectorId)); String operatorId3rdpty = startChargeSeq.substring(0, 9);
emptyHorder.setConfirmResult(-1); emptyHorder.setOperatorId3rdptyEvcs(operatorId3rdpty);
xhpcHistoryOrderRepository.save(emptyHorder); emptyHorder.setUserId(xhpcInternetUserRepository.queryDbId(operatorId3rdpty));
emptyHorder.setType(1);
emptyHorder.setSource(1);
emptyHorder.setState(-1);
emptyHorder.setChargingStationId(stationId);
emptyHorder.setTerminalId(xhpcTerminalRepository.queryDbId(connectorId));
emptyHorder.setConfirmResult(-1);
xhpcHistoryOrderRepository.save(emptyHorder);
}
} }