From fc6db765c7f779144927d6ff14d282417ec27072 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 17:03:14 +0800 Subject: [PATCH] fix bug --- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 36a4e1514..dd79886f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -236,7 +236,10 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 - merchantSubsidy.setCardSpendListShow(0); + if (cardInfo.getSaleAmount()>0 && subsidyFee > 0) { + merchantSubsidy.setCardSpendListShow(0); + } + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate);