Browse Source

Merge branch 'release_toaliyun_real' into release_real_202010

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
f3ff71d2d4
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java

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

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


Loading…
Cancel
Save