| @@ -89,7 +89,7 @@ public class WxCarCallBackController extends BaseController { | |||
| wxCarCmdLog.setUpdateDate(currentDate); | |||
| String etcpParkId = paramMap.get(ETCPUtil.ETCP_PARK_ID); | |||
| String tenantId = ""; | |||
| String tenantId = null; | |||
| WxPark parkQ = new WxPark(); | |||
| parkQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); | |||
| parkQ.setParkingId(etcpParkId); | |||
| @@ -169,7 +169,7 @@ public class WxCarCallBackController extends BaseController { | |||
| record.setFixParkingId(fixParkingId); | |||
| record.setRemainingDays(remainingDays); | |||
| record.setPhone(phoneStrs); | |||
| record.setTenantId(park.getTenantId()); | |||
| record.setTenantId(tenantId); | |||
| wxCarPayRecordService.updateBySynId(record); | |||
| } catch (Exception e) { | |||
| e.printStackTrace(); | |||
| @@ -218,6 +218,7 @@ public class WxCarCallBackController extends BaseController { | |||
| wxCarCmdLog.setUpdateDate(currentDate); | |||
| String etcpParkId = paramMap.get(ETCPUtil.ETCP_PARK_ID); | |||
| String tenantId = null; | |||
| WxPark parkQ = new WxPark(); | |||
| parkQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); | |||
| parkQ.setParkingId(etcpParkId); | |||
| @@ -226,7 +227,8 @@ public class WxCarCallBackController extends BaseController { | |||
| logger.error("etcpParkOutCallback: ETCP车场未找到 " + etcpParkId); | |||
| // return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId); | |||
| } else { | |||
| wxCarCmdLog.setTenantId(park.getTenantId()); | |||
| tenantId = park.getTenantId(); | |||
| wxCarCmdLog.setTenantId(tenantId); | |||
| } | |||
| try { | |||
| @@ -252,8 +254,6 @@ public class WxCarCallBackController extends BaseController { | |||
| } | |||
| wxCarPayRecordService.updateBySynId(record); | |||
| } catch (Exception e) { | |||
| e.printStackTrace(); | |||
| logger.error("WxCarPayRecord: 出场更新错误 " , e); | |||
| logger.error("WxCarPayRecord: 出场更新错误 " +e.getMessage()+", " +paramMap.toString()); | |||
| return true; | |||
| } | |||
| @@ -321,10 +321,10 @@ public class WxCarCallBackController extends BaseController { | |||
| String orderId = paramMap.get(ETCPUtil.ETCP_ORDER_ID); | |||
| HashMap<String, String> map = new HashMap<String, String>(); | |||
| map.put("synId", orderId); | |||
| String tenant_id = wxCarCmdLogService.getTenantIdBySynId(map); | |||
| String tenantId = wxCarCmdLogService.getTenantIdBySynId(map); | |||
| // 检查是否有重复数据 | |||
| map.put("tenantId", tenant_id); | |||
| map.put("tenantId", tenantId); | |||
| map.put("orderId", orderId); | |||
| Long count = wxCarCmdLogService.getCountByOrderId(map); | |||
| if(count > 0) { | |||
| @@ -334,8 +334,8 @@ public class WxCarCallBackController extends BaseController { | |||
| Date currentDate = new Date(); | |||
| WxCarCmdLog wxCarCmdLog = new WxCarCmdLog(); | |||
| if(StringUtils.isNotBlank(tenant_id)) { | |||
| wxCarCmdLog.setTenantId(tenant_id); | |||
| if(StringUtils.isNotBlank(tenantId)) { | |||
| wxCarCmdLog.setTenantId(tenantId); | |||
| } | |||
| wxCarCmdLog.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); | |||
| wxCarCmdLog.setCmdType(EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); | |||
| @@ -364,7 +364,6 @@ public class WxCarCallBackController extends BaseController { | |||
| record.setFee(fee); | |||
| wxCarPayRecordService.updateBySynId(record); | |||
| } catch (Exception e) { | |||
| logger.error("WxCarPayRecord: 缴费更新错误 " ,e); | |||
| logger.error("WxCarPayRecord: 缴费更新错误 " +e.getMessage()+", "+ paramMap.toString()); | |||
| //return new Result(ErrorCode.DB_FAIL.getCode(), "入库错误" + paramMap.toString()); | |||
| } | |||