功能优化

src/main/java/com/template/controller/LoginController.java

@@ -523,11 +523,17 @@ public class LoginController implements LoginControllerAPI {
         //endregion
 
         if(!(student.getIsPay() != null && student.getIsPay().intValue() == 1)){
+            System.out.println("进支付比较");
             List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(student.getAdmissNum(),TimeExchange.getYear());
+            System.out.println("进支付比较1"+JSON.toJSON(payInfos));
             if(payInfos != null && payInfos.size() > 0){
+                System.out.println("进支付比较2");
                 List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(student.getSchool());
+                System.out.println("进支付比较3");
                 if(paySettings != null && paySettings.size() > 0){
+                    System.out.println("进支付比较4");
                     for (WelcomePaySetting pay:paySettings) {
+                        System.out.println("进支付比较5");
                         BigDecimal money = pay.getPayAmount();
                         if(pay.getMethod().equals("全部")){
                             BigDecimal totalSj = new BigDecimal(BigInteger.ZERO);

src/main/java/com/template/controller/WelcomeStudentController.java

@@ -586,7 +586,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             return CommonResult.fail(st);
         }
 
-        WelcomeStudent ws = welcomeStudentService.getDataByIdcard(icr.getCardId());
+        WelcomeStudent ws = welcomeStudentService.getDataByIdcardOrNum(icr.getAdmissNum(), icr.getCardId());
         if (ws == null) {
             ws = new WelcomeStudent();
         }
@@ -669,8 +669,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             if(payInfos != null && payInfos.size() > 0){
                 System.out.println("进支付比较2");
                 List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(ws.getSchool());
+                System.out.println("进支付比较3"+JSON.toJSON(paySettings));
                 if(paySettings != null && paySettings.size() > 0){
+                    System.out.println("进支付比较4");
                     for (WelcomePaySetting pay:paySettings) {
+                        System.out.println("进支付比较5");
                         BigDecimal money = pay.getPayAmount();
                         if(pay.getMethod().equals("全部")){
                             BigDecimal totalSj = new BigDecimal(BigInteger.ZERO);