Browse Source

修改分页页码和分页大小限制

csk 2 years ago
parent
commit
0e7ea12c7b

+ 13 - 0
eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -106,7 +106,12 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             String starTime = (String) weSalesMsg.get("starTime");
             String starTime = (String) weSalesMsg.get("starTime");
             String endTime = (String) weSalesMsg.get("endTime");
             String endTime = (String) weSalesMsg.get("endTime");
             Integer pageIndex = Integer.parseInt(weSalesMsg.get("pageIndex")+"");
             Integer pageIndex = Integer.parseInt(weSalesMsg.get("pageIndex")+"");
+            pageIndex = pageIndex <= 1 ? 1 : pageIndex;
+
             Integer pageSize = Integer.parseInt(weSalesMsg.get("pageSize")+"");
             Integer pageSize = Integer.parseInt(weSalesMsg.get("pageSize")+"");
+            pageSize = pageSize <= 0 ? 1 : pageSize;
+            pageSize = pageSize >= 500 ? 500 : pageSize;
+
             weSalesMsg.put("starTime", DateUtils.getStrDate((String) weSalesMsg.get("starTime")));
             weSalesMsg.put("starTime", DateUtils.getStrDate((String) weSalesMsg.get("starTime")));
             weSalesMsg.put("endTime",DateUtils.getStrDate((String)weSalesMsg.get("endTime")));
             weSalesMsg.put("endTime",DateUtils.getStrDate((String)weSalesMsg.get("endTime")));
 
 
@@ -223,13 +228,21 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             }
             }
 
 
             Map<String, Object> weDtilMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapMsg.get("data").toString()), Map.class);
             Map<String, Object> weDtilMsg =  JSONObject.toJavaObject(JSON.parseObject(weChatMapMsg.get("data").toString()), Map.class);
+
             Integer pageIndex = Integer.parseInt(weDtilMsg.get("pageIndex")+"");
             Integer pageIndex = Integer.parseInt(weDtilMsg.get("pageIndex")+"");
+            pageIndex = pageIndex <= 1 ? 1 : pageIndex;
+
             Integer pageSize = Integer.parseInt(weDtilMsg.get("pageSize")+"");
             Integer pageSize = Integer.parseInt(weDtilMsg.get("pageSize")+"");
+            pageSize = pageSize <= 0 ? 1 : pageSize;
+            pageSize = pageSize >= 500 ? 500 : pageSize;
+
             pageIndex = (pageIndex-1)*pageSize;
             pageIndex = (pageIndex-1)*pageSize;
+
             weChatMapMsg.put("offset",pageIndex);
             weChatMapMsg.put("offset",pageIndex);
             weChatMapMsg.put("limit",pageSize);
             weChatMapMsg.put("limit",pageSize);
             weChatMapMsg.put("merchId",merchId);
             weChatMapMsg.put("merchId",merchId);
             weChatMapMsg.put("sign",strSign);
             weChatMapMsg.put("sign",strSign);
+
             String merchSn = weDtilMsg.get("merchSn").toString().trim()==null?"":weDtilMsg.get("merchSn").toString().trim();
             String merchSn = weDtilMsg.get("merchSn").toString().trim()==null?"":weDtilMsg.get("merchSn").toString().trim();
             if(merchSn.equals("")){
             if(merchSn.equals("")){
                 return Result.error("900001","参数错误");
                 return Result.error("900001","参数错误");