Prechádzať zdrojové kódy

feature: 门诊缴费日期传空测试

wuyongyi 2 rokov pred
rodič
commit
76d0c162bf

+ 7 - 2
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvPayServiceImpl.java

@@ -347,8 +347,13 @@ public class IsvPayServiceImpl implements IsvPayService {
                         String endDate = request.getEndTime();
                         Date start = DateUtil.parseDate(startDate, 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;
                         day = DateUtil.getDaySub(request.getEndTime(), request.getStartTime());
                         if (day < -15) {

+ 1 - 1
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -617,7 +617,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 list.add(data);
             }
         }
-        Pagination pagination = new Pagination(request.getPageIndex(), total, total);
+        Pagination pagination = new Pagination(request.getPageIndex(), request.getPageSize(), total);
         PageVO<QueryOrderListResponseData> resp = new PageVO<>(pagination, list);
         return resp;
     }