Kaynağa Gözat

Merge branch 'release_toaliyun_real' into release_real_202010

release_toaliyun_real
xiaohanzi 5 yıl önce
ebeveyn
işleme
f3c12e0b67
1 değiştirilmiş dosya ile 4 ekleme ve 4 silme
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java Dosyayı Görüntüle

@@ -148,10 +148,6 @@ public class WxCardPayController extends BaseController {
wxCardSpendVo.setPayStatusS(tmpList); wxCardSpendVo.setPayStatusS(tmpList);
} }
} }
List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources);
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
wxCardSpendService.exportData(wxCardSpendVo, request, response); wxCardSpendService.exportData(wxCardSpendVo, request, response);
} }


@@ -232,6 +228,10 @@ public class WxCardPayController extends BaseController {
wxCardSpendVo.setPayStatusS(tmpList); wxCardSpendVo.setPayStatusS(tmpList);
} }
} }
List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources);
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
wxCardSpendService.exportData(wxCardSpendVo, request, response); wxCardSpendService.exportData(wxCardSpendVo, request, response);


} }


Yükleniyor…
İptal
Kaydet