diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907191230__CAR_DATA.sql b/mallinkAdmin/src/main/resources/db/migration/V201907191230__CAR_DATA.sql new file mode 100644 index 000000000..2f8de6dfb --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907191230__CAR_DATA.sql @@ -0,0 +1,2 @@ +alter table wx_car_cmd_log +add column fee_time VARCHAR(50) GENERATED ALWAYS AS (`cmd_json` ->> '$.time') NULL; \ No newline at end of file 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 f1f9f10ca..e0389a057 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -319,6 +319,7 @@ public class WxCarCallBackController extends BaseController { // 根据orderId获取入场信息,确定租户ID String orderId = paramMap.get(ETCPUtil.ETCP_ORDER_ID); + String etcpTime = paramMap.get(ETCPUtil.ETCP_TIME); HashMap map = new HashMap(); map.put("synId", orderId); String tenantId = wxCarCmdLogService.getTenantIdBySynId(map); @@ -326,8 +327,9 @@ public class WxCarCallBackController extends BaseController { // 检查是否有重复数据 map.put("tenantId", tenantId); map.put("orderId", orderId); - Long count = wxCarCmdLogService.getCountByOrderId(map); - if(count > 0) { + map.put("feeTime", etcpTime); + WxCarCmdLog carCmdLog = wxCarCmdLogService.getByOrderId(map); + if(carCmdLog != null) { logger.error("ETCP order已入库: " + orderId); return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); } @@ -350,7 +352,7 @@ public class WxCarCallBackController extends BaseController { } String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE); - String etcpTime = paramMap.get(ETCPUtil.ETCP_TIME); + String fee = paramMap.get("fee"); try { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java index 617b39f66..c2c0d3452 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java @@ -28,7 +28,7 @@ public interface WxCarCmdLogMapper extends CommonMapper { Long queryWeekCarPayCount(HashMap params); - Long countPaidInfoByOrderId(HashMap params); + WxCarCmdLog queryByOrderId(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 728a54456..339e0c539 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -50,7 +50,7 @@ public interface WxCarCmdLogService { */ String getTenantIdBySynId(HashMap params); - Long getCountByOrderId(HashMap params); + WxCarCmdLog getByOrderId(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 4b9cd8007..aa08264b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -61,8 +61,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public Long getCountByOrderId(HashMap params) { - return wxCarCmdLogMapper.countPaidInfoByOrderId(params); + public WxCarCmdLog getByOrderId(HashMap params) { + return wxCarCmdLogMapper.queryByOrderId(params); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index c9ed2851f..027e019a5 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -127,15 +127,18 @@ where cmd_type = 601 and syn_id = #{synId} - + select * from wx_car_cmd_log where cmd_type = 604 - and tenant_id = #{tenantId} + and tenant_id = #{tenantId} - and order_id = #{orderId} + and order_id = #{orderId} + + + and fee_time = #{feeTime}