From d8fc46003d38305de1840dc8c3dd0ca9fd029326 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sun, 29 Mar 2020 17:25:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=85=8D=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8D=A1=E6=B6=88=E8=B4=B9=E5=A4=9A=E6=9D=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 6decd9519..401e118e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -206,7 +206,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { Integer subsidyFee = subsidyFeeD.intValue(); logger.info("补贴额: " + subsidyFee); if (cardInfo.getSaleAmount().equals(0) || subsidyFee > 0) { - // 有补贴时入库 + // 有补贴时入库, 免费卡消费时, 或者有补贴金额时 int iSubChargeFee = PayUtils.getPayRate(subsidyFee, payAccount.getRate(), false); Integer realSubsidyFee = subsidyFee - iSubChargeFee; WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); @@ -246,8 +246,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } if (payAccount.checkShare()) { + // 分账 if (cardInfo.isBuyed()) { - // 9. 有价卡分账 + // 9. 只有有价卡才能分账 try { shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId()); } catch (MallinkException e) { @@ -268,7 +269,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } } } else { - // 有价储值卡-补贴 + // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO if (cardInfo.isBuyed() && payment > 0) { try { creteMerchantSubsidy(record, curDate, idWorker, coupon, payment);