From 2b01a79bfc962d3fd788351d9f366a391d41ea8b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 17 Jul 2019 15:16:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=81=9C=E8=BD=A6=E7=BC=B4=E8=B4=B9=E7=BB=9F=E8=AE=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callback/WxCarCallBackController.java | 24 +++++++++++++------ .../iformall/mapper/WxCarCmdLogMapper.java | 4 +++- .../iformall/service/WxCarCmdLogService.java | 2 ++ .../service/impl/WxCarCmdLogServiceImpl.java | 10 +++++--- .../resources/mapper/WxCarCmdLogMapper.xml | 17 ++++++++++++- 5 files changed, 45 insertions(+), 12 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 6c0a5f162..81e16c1b5 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -101,13 +101,6 @@ public class WxCarCallBackController extends BaseController { wxCarCmdLog.setTenantId(park.getTenantId()); } - try { - wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); - } catch (Exception e) { - logger.error("etcpParkInCallback: 入库错误 " + paramMap.toString()); - return true; - } - String carNumber = paramMap.get("plateNumber"); String synId = paramMap.get("synId"); String parkId = paramMap.get("parkId"); @@ -117,6 +110,23 @@ public class WxCarCallBackController extends BaseController { String fixParkingId = paramMap.get("fixParkingId"); String remainingDays = paramMap.get("remainingDays"); + // 检查是否有重复数据 + HashMap map = new HashMap(); + map.put("synId", synId); + map.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); + Long count = wxCarCmdLogService.getCountBySynId(map); + if(count > 1) { + logger.error("ETCP synId已入库: " + paramMap.toString()); + return true; + } + + try { + wxCarCmdLogService.saveOrUpdate(wxCarCmdLog); + } catch (Exception e) { + logger.error("etcpParkInCallback: 入库错误 " + paramMap.toString()); + return true; + } + String phoneStrs = ""; // 停车发券 diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index 08b89d279..617b39f66 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -28,5 +28,7 @@ public interface WxCarCmdLogMapper extends CommonMapper { Long queryWeekCarPayCount(HashMap params); - Long queryPaidInfoByOrderId(HashMap params); + Long countPaidInfoByOrderId(HashMap params); + + Long countBySynId(HashMap params); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index 7b44df5b7..728a54456 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -52,6 +52,8 @@ public interface WxCarCmdLogService { Long getCountByOrderId(HashMap params); + Long getCountBySynId(HashMap params); + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index 9d0c22993..f27724606 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -61,9 +61,13 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public - Long getCountByOrderId(HashMap params) { - return wxCarCmdLogMapper.queryPaidInfoByOrderId(params); + public Long getCountByOrderId(HashMap params) { + return wxCarCmdLogMapper.countPaidInfoByOrderId(params); + } + + @Override + public Long getCountBySynId(HashMap params) { + return wxCarCmdLogMapper.countBySynId(params); } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index c536f7fe7..079a32068 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -127,7 +127,7 @@ where cmd_type = 601 and json_extract(cmd_json, "$.synId") = #{synId} - select count(id) from wx_car_cmd_log where cmd_type = 604 @@ -138,6 +138,21 @@ and json_extract(cmd_json, "$.orderId") = #{orderId} + +