From 9ca73df53cd79e076d0dbe1d5027cb43a10d5097 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 19 Jul 2019 16:42:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=BD=A6=E6=B5=81][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E9=94=99=E8=AF=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/callback/WxCarCallBackController.java | 7 +++---- .../java/com/iformall/mapper/WxCarPayRecordMapper.java | 2 ++ .../java/com/iformall/service/WxCarPayRecordService.java | 2 ++ .../iformall/service/impl/WxCarPayRecordServiceImpl.java | 6 +++++- .../src/main/resources/mapper/WxCarPayRecordMapper.xml | 8 ++++++++ 5 files changed, 20 insertions(+), 5 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 13ee884e0..6fef75862 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -391,7 +391,6 @@ public class WxCarCallBackController extends BaseController { } String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE); - String feetime = paramMap.get("time"); String synId = paramMap.get(ETCPUtil.ETCP_SYN_ID); String exitTime = paramMap.get(ETCPUtil.ETCP_EXIT_TIME); String stayedTime = paramMap.get(ETCPUtil.ETCP_STAYED_TIME); @@ -434,9 +433,9 @@ public class WxCarCallBackController extends BaseController { WxCarPayRecord query = new WxCarPayRecord(); query.setSynId(orderId); - PageInfo page = wxCarPayRecordService.findCarPayListByPage(query,1,10); - if(page != null && CollectionUtils.isNotEmpty(page.getList())){ - if(page.getList().size()>=2) { + Integer findCarPayCount = wxCarPayRecordService.findCarPayCount(query); + if(findCarPayCount != null && findCarPayCount.intValue() > 0){ + if(findCarPayCount.intValue() >= 2){ wxCarPayRecordService.saveOrUpdate(record); }else{ wxCarPayRecordService.updateBySynId(record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java index 5240934f3..df924d643 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayRecordMapper.java @@ -10,6 +10,8 @@ import java.util.List; public interface WxCarPayRecordMapper extends CommonMapper { List findCarPayListByPage(WxCarPayRecord record); + Integer findCarPayCount(WxCarPayRecord record); + List findCarPayList(WxCarPayRecord record); void updateBySynId(WxCarPayRecord record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java b/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java index 66c14f8d9..739856fc3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarPayRecordService.java @@ -17,4 +17,6 @@ public interface WxCarPayRecordService { void saveOrUpdate(WxCarPayRecord record); void updateBySynId(WxCarPayRecord record); + + Integer findCarPayCount(WxCarPayRecord record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java index bc3562f15..89b9f16f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java @@ -34,9 +34,13 @@ public class WxCarPayRecordServiceImpl implements WxCarPayRecordService{ } } - @Override public void updateBySynId(WxCarPayRecord record) { wxCarPayRecordMapper.updateBySynId(record); } + + @Override + public Integer findCarPayCount(WxCarPayRecord record) { + return wxCarPayRecordMapper.findCarPayCount(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index 6b924f640..c27736ba8 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -102,4 +102,12 @@ where syn_id = #{synId} + + +