|
|
@@ -195,7 +195,21 @@ public class WxCarETCPCallBackController extends BaseController { |
|
|
carCmdLogQ.setCmdType(EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); |
|
|
carCmdLogQ.setCmdType(EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); |
|
|
carCmdLogQ.setSynId(orderId); |
|
|
carCmdLogQ.setSynId(orderId); |
|
|
carCmdLogQ.setPlateNumber(carNumber); |
|
|
carCmdLogQ.setPlateNumber(carNumber); |
|
|
WxCarCmdLog tenantInfo = wxCarCmdLogService.getTenantInfoBySynId(carCmdLogQ); |
|
|
|
|
|
|
|
|
//此处去park里面轮询 |
|
|
|
|
|
WxPark wxparkQuery = new WxPark(); |
|
|
|
|
|
wxparkQuery.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); |
|
|
|
|
|
PageInfo<WxPark> pages = wxParkService.listAsPage(wxparkQuery, 1, 10000); |
|
|
|
|
|
WxCarCmdLog tenantInfo = null; |
|
|
|
|
|
if (null != pages && null != pages.getList() ) { |
|
|
|
|
|
for (int i = 0 ; i < pages.getList().size(); i ++) { |
|
|
|
|
|
carCmdLogQ.setTenantId(pages.getList().get(i).getTenantId()); |
|
|
|
|
|
tenantInfo = wxCarCmdLogService.getTenantInfoBySynId(carCmdLogQ); |
|
|
|
|
|
if (null != tenantInfo) { |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
String tenantId = null; |
|
|
String tenantId = null; |
|
|
/// if not found syn_id, maybe use user_car to get tenantId |
|
|
/// if not found syn_id, maybe use user_car to get tenantId |
|
|
if(tenantInfo == null) { |
|
|
if(tenantInfo == null) { |
|
|
@@ -205,6 +219,12 @@ public class WxCarETCPCallBackController extends BaseController { |
|
|
if(userCar != null) { |
|
|
if(userCar != null) { |
|
|
tenantId = userCar.getTenantId(); |
|
|
tenantId = userCar.getTenantId(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (StringUtils.isBlank(tenantId)) { |
|
|
|
|
|
logger.error("["+getIpAddr()+"etcpPaidCallback: " + paramMap.toString() +" find no tenantInfo" ); |
|
|
|
|
|
return new Result(ErrorCode.SYS_SERVER_ERROR.getCode(), "入库错误 find no tenantInfo"); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(tenantId)) { |
|
|
if (StringUtils.isNotBlank(tenantId)) { |
|
|
carCmdLogQ.setTenantId(tenantId); |
|
|
carCmdLogQ.setTenantId(tenantId); |
|
|
} |
|
|
} |
|
|
|