From f1502c812b8fc430e96a4a21e233f892b52cc9f0 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 11 Oct 2019 13:28:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=9C=89=E4=BB=B7=E5=8D=A1=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=97=A0=E5=88=86=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxPayAccount.java | 2 +- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 4 ++-- .../java/com/iformall/service/impl/WxSubsidyServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 6f4973de0..694d07d35 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -44,6 +44,6 @@ public class WxPayAccount extends BaseEntity { return notifyUrl + "/subsidyPay"; } - public boolean isShare() { return share > 0; } + public boolean checkShare() { return share > 0; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 02316e683..8efabe9e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -241,7 +241,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } } - if (payAccount.isShare()) { + if (payAccount.checkShare()) { // 9. 分账 try { shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 2c88f4ac7..7acd45999 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -169,7 +169,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); } WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - if (payAccount.getShare().intValue() > 0) { + if (payAccount.checkShare()) { isShare = EnumPayShare.YES; } @@ -433,7 +433,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); } WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - if (payAccount.getShare().intValue() > 0) { + if (payAccount.checkShare()) { isShare = EnumPayShare.YES; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java index 66fa7d8d3..06db1696d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubsidyServiceImpl.java @@ -91,7 +91,7 @@ public class WxSubsidyServiceImpl implements WxSubsidyService { WxAppinfo appInfo = wxAppinfoService.getCAppInfo(user.getTenantId()); // 2. 获取payAccount WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); - if (payAccount.getShare().intValue() > 0) { + if (payAccount.checkShare()) { isShare = EnumPayShare.YES; } // 3. 补贴订单