From f88f83a68bb55223add94079f9609f96ed0b0ab6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 8 Sep 2022 14:09:35 +0800 Subject: [PATCH] // test --- ...20220801000001_cashout.sql => V2022080100001_cashout.sql} | 0 .../{V20220804000001_bill.sql => V2022080400001_bill.sql} | 0 .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 5 +++++ 3 files changed, 5 insertions(+) rename mallinkAdmin/src/main/resources/db/migration/{V20220801000001_cashout.sql => V2022080100001_cashout.sql} (100%) rename mallinkAdmin/src/main/resources/db/migration/{V20220804000001_bill.sql => V2022080400001_bill.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V20220801000001_cashout.sql b/mallinkAdmin/src/main/resources/db/migration/V2022080100001_cashout.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V20220801000001_cashout.sql rename to mallinkAdmin/src/main/resources/db/migration/V2022080100001_cashout.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql b/mallinkAdmin/src/main/resources/db/migration/V2022080400001_bill.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V20220804000001_bill.sql rename to mallinkAdmin/src/main/resources/db/migration/V2022080400001_bill.sql diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d4092c165..fcf1fd62f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1715,6 +1715,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (couponOrder.getCouponPrice() > 0) { recordAfterVerified(couponOrder, merchantId); } + Date time = DateUtils.stringToDate("2022-09-08 14:10:00", "yyyy-MM-dd HH:mm:ss"); + if(EnumPayWay.PAY_WAY_WECHAT.getCode().equals(wxPayOrder.getPayVendor()) + && wxPayOrder.getCreateTime().before(time)){ + return; + } } catch (Exception e) { logger.error("核销记账失败"+e.getMessage(),e); }