Browse Source

[卡消费列表][修改]:修复crash

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
53fa6dcc7b
2 changed files with 2 additions and 6 deletions
  1. +0
    -4
      mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

+ 0
- 4
mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java View File

@@ -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;
}


}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -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) {


Loading…
Cancel
Save