From 14320df30b610213ecc57bb2a5cad9d74d2dc870 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 18 Jul 2019 14:22:15 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/WxCarCallBackController.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java index 79253fe82..f1f9f10ca 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -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 map = new HashMap(); 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()); }