|
@@ -769,7 +769,7 @@ public class PayCenterService {
|
|
|
* @param pageSize
|
|
* @param pageSize
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- public R<RechargePage> rechargeOrder(String uid, String startDate, String endDate, String keyword, Integer page, Integer pageSize) {
|
|
|
|
|
|
|
+ public R<RechargePage> rechargeOrder(String uid, String filter,ChannelEnum channelEnum,String startDate, String endDate, String keyword, Integer page, Integer pageSize) {
|
|
|
if (Objects.isNull(page)) {
|
|
if (Objects.isNull(page)) {
|
|
|
page = 1;
|
|
page = 1;
|
|
|
}
|
|
}
|
|
@@ -780,6 +780,8 @@ public class PayCenterService {
|
|
|
Integer finalPageSize = pageSize;
|
|
Integer finalPageSize = pageSize;
|
|
|
String sync = getHttp(PayCenterEnum.RECHARGE_ORDER, new HashMap<>() {{
|
|
String sync = getHttp(PayCenterEnum.RECHARGE_ORDER, new HashMap<>() {{
|
|
|
put("uid", uid);
|
|
put("uid", uid);
|
|
|
|
|
+ put("filter", filter);
|
|
|
|
|
+ put("channel", channelEnum);
|
|
|
put("keyword", keyword);
|
|
put("keyword", keyword);
|
|
|
put("startDate", startDate);
|
|
put("startDate", startDate);
|
|
|
put("endDate", endDate);
|
|
put("endDate", endDate);
|