From a4f09ef3e21646613462217a354eacc361c50b28 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 11:46:59 +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=E6=95=B0=E6=8D=AE=E5=85=A5=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,15=E5=88=86=E9=92=9F=E5=86=85=E7=BC=B4=E8=B4=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95update=EF=BC=8C=E4=B8=8D=E5=86=8Dinsert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/callback/WxCarCallBackController.java | 1 + .../src/main/resources/mapper/WxCarPayRecordMapper.xml | 3 +++ 2 files changed, 4 insertions(+) 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 fcc48b4ba..1539d285d 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -439,6 +439,7 @@ public class WxCarCallBackController extends BaseController { WxCarPayRecord query = new WxCarPayRecord(); query.setSynId(orderId); + query.setFee(fee); if(feeTime != null) { query.setFeeTime(feeTime); } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml index 8db66b319..233432a52 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayRecordMapper.xml @@ -44,6 +44,9 @@ and `fee_time` = #{feeTimeStr} + + and `fee` = #{fee} + and TIMESTAMPDIFF(MINUTE, `fee_time`, #{feeTime}) <= 15