From 53fa6dcc7b92f98edc9ef5df8ef3d44bcad42330 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 30 Mar 2020 19:14:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E6=B6=88=E8=B4=B9=E5=88=97=E8=A1=A8]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E4=BF=AE=E5=A4=8Dcrash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxCardInfo.java | 4 ---- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 89a2ce960..172354dd6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -58,9 +58,5 @@ public class WxCardInfo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") private Integer supportTransfer; - public boolean isBuyed() { - return saleAmount > 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 401e118e4..793cfd1e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -247,7 +247,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { if (payAccount.checkShare()) { // 分账 - if (cardInfo.isBuyed()) { + if (cardInfo.getSaleAmount() > 0) { // 9. 只有有价卡才能分账 try { shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId()); @@ -270,7 +270,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } } else { // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO - if (cardInfo.isBuyed() && payment > 0) { + if (cardInfo.getSaleAmount() > 0 && payment > 0) { try { creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); } catch (Exception ex) {