展示不完整方案，优化

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -227,7 +227,12 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getSportsList(total, firstRule, secondRule, className, professionName);
         }
 
-        //4判断是否展示全部方案
+        //4、判断返回的结果数据是否大于totalResult
+        if (list.size() > totalResult) {
+            list = getVolunteerList(list, totalResult);
+        }
+
+        //5判断是否展示全部方案
         if (queryVo.getIsShowAll() == 0) {
             List<Volunteer> result;
             if (list.size() < 10) {
@@ -242,11 +247,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.ok(volunteerVo);
         }
 
-        //5、判断返回的结果数据是否大于totalResult
-        if (list.size() > totalResult) {
-            list = getVolunteerList(list, totalResult);
-        }
-
         //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
         R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
         if (null != bool && bool.getCode() == 500) {

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java

@@ -134,6 +134,7 @@ public class PayController {
     public R<String> h5WxPay(@RequestBody PayPageDto payPageDto,HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException {
         return testWxPayService.h5WxPay(payPageDto,request, response);
     }
+
     /**
      * 微信回调函数
      * 支付成功后微信服务器会调用此方法