Просмотр исходного кода

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

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
53fa6dcc7b
2 измененных файлов: 2 добавлений и 6 удалений
  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 Просмотреть файл

@@ -58,9 +58,5 @@ public class WxCardInfo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer") @io.swagger.annotations.ApiModelProperty(value = "是否支持转送(0:不支持,1支持)", name = "supportTransfer")
private Integer supportTransfer; private Integer supportTransfer;


public boolean isBuyed() {
return saleAmount > 0;
}



} }

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Просмотреть файл

@@ -247,7 +247,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {


if (payAccount.checkShare()) { if (payAccount.checkShare()) {
// 分账 // 分账
if (cardInfo.isBuyed()) {
if (cardInfo.getSaleAmount() > 0) {
// 9. 只有有价卡才能分账 // 9. 只有有价卡才能分账
try { try {
shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId()); shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId());
@@ -270,7 +270,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
} }
} else { } else {
// 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO
if (cardInfo.isBuyed() && payment > 0) {
if (cardInfo.getSaleAmount() > 0 && payment > 0) {
try { try {
creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); creteMerchantSubsidy(record, curDate, idWorker, coupon, payment);
} catch (Exception ex) { } catch (Exception ex) {


Загрузка…
Отмена
Сохранить