xiaohanzi 5 лет назад
Родитель
Сommit
3738b00b55
2 измененных файлов: 25 добавлений и 1 удалений
  1. +21
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java

+ 21
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxCarETCPCallBackController.java Просмотреть файл

@@ -195,7 +195,21 @@ public class WxCarETCPCallBackController extends BaseController {
carCmdLogQ.setCmdType(EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode());
carCmdLogQ.setSynId(orderId);
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;
/// if not found syn_id, maybe use user_car to get tenantId
if(tenantInfo == null) {
@@ -205,6 +219,12 @@ public class WxCarETCPCallBackController extends BaseController {
if(userCar != null) {
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)) {
carCmdLogQ.setTenantId(tenantId);
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/etcp/EtcpHelper.java Просмотреть файл

@@ -61,6 +61,10 @@ public class EtcpHelper {
public ResultData initForEtcp(Map<String, String> paramMap, Long userId, WxPark park) {
String phone = paramMap.get("phone");
WxCUserBasicInfo user = wxCUserBasicInfoService.getById(userId,park.getFinalTenantId());
if (null == user) {
logger.error("暂未成为会员,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号");
}
if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone())) {
logger.error("暂未成为会员,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号");


Загрузка…
Отмена
Сохранить