|
@@ -347,8 +347,13 @@ public class IsvPayServiceImpl implements IsvPayService {
|
|
String endDate = request.getEndTime();
|
|
String endDate = request.getEndTime();
|
|
Date start = DateUtil.parseDate(startDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date start = DateUtil.parseDate(startDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date end = DateUtil.parseDate(endDate, DateUtil.DADE_FROMAT_YMD);
|
|
Date end = DateUtil.parseDate(endDate, DateUtil.DADE_FROMAT_YMD);
|
|
- CheckUtil.ensureNotNull(start, "请选择时间");
|
|
|
|
- CheckUtil.ensureNotNull(end, "请选择时间");
|
|
|
|
|
|
+ if(Checker.isNone(start) || Checker.isNone(end)){
|
|
|
|
+ Pagination pagination = new Pagination(pageIndex, pageSize, total);
|
|
|
|
+ PageVO<PayHistoryResponseData> res = new PageVO<>(pagination, list);
|
|
|
|
+ return res;
|
|
|
|
+ }
|
|
|
|
+// CheckUtil.ensureNotNull(start, "请选择时间");
|
|
|
|
+// CheckUtil.ensureNotNull(end, "请选择时间");
|
|
long day = 0;
|
|
long day = 0;
|
|
day = DateUtil.getDaySub(request.getEndTime(), request.getStartTime());
|
|
day = DateUtil.getDaySub(request.getEndTime(), request.getStartTime());
|
|
if (day < -15) {
|
|
if (day < -15) {
|