Merge branch 'release_toaliyun_real' into release_real_202010

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);