|
|
|
@@ -110,7 +110,7 @@ public class WxCardPayController extends BaseController { |
|
|
|
List<Integer> sources = new ArrayList<Integer>(); |
|
|
|
sources.add(EnumMerchantSubsidySource.CARD.getCode()); |
|
|
|
wxCardSpendVo.setSources(sources); |
|
|
|
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); |
|
|
|
wxCardSpendVo.setCardSpendListShow(1); |
|
|
|
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -125,6 +125,10 @@ public class WxCardPayController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); |
|
|
|
} |
|
|
|
wxCardSpend.updateTenantInfo(getTenantInfo()); |
|
|
|
List<Integer> sources = new ArrayList<Integer>(); |
|
|
|
sources.add(EnumMerchantSubsidySource.CARD.getCode()); |
|
|
|
wxCardSpend.setSources(sources); |
|
|
|
wxCardSpend.setCardSpendListShow(1); |
|
|
|
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); |
|
|
|
return new ResultData(mapList); |
|
|
|
} |
|
|
|
@@ -148,10 +152,6 @@ public class WxCardPayController extends BaseController { |
|
|
|
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); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -232,6 +232,10 @@ public class WxCardPayController extends BaseController { |
|
|
|
wxCardSpendVo.setPayStatusS(tmpList); |
|
|
|
} |
|
|
|
} |
|
|
|
List<Integer> sources = new ArrayList<Integer>(); |
|
|
|
sources.add(EnumMerchantSubsidySource.CARD.getCode()); |
|
|
|
wxCardSpendVo.setSources(sources); |
|
|
|
wxCardSpendVo.setCardSpendListShow(1); |
|
|
|
wxCardSpendService.exportData(wxCardSpendVo, request, response); |
|
|
|
|
|
|
|
} |
|
|
|
|