优化支付

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

@@ -335,6 +335,10 @@ public class LoginController implements LoginControllerAPI {
             }
             studentId = student.getId();
         }
+
+        if(student.getIsPay() == null){
+            student.setIsPay(0);
+        }
         wxLoginVo wlv = new wxLoginVo();
         List<WelcomeOrg> orgs = welcomeOrgService.queryDatas(college, profession, classStr);
         if (orgs != null && orgs.size() > 0) {
@@ -517,27 +521,6 @@ public class LoginController implements LoginControllerAPI {
         }
         student.setAtvs(atvs);
 
-        //region 查询缴费
-        if (!(student.getIsPay() != null && student.getIsPay().intValue() == 1)) {//未缴费的情况下去查
-            if (StringUtils.hasText(student.getAdmissNum()) && StringUtils.hasText(student.getSchool())) {
-                List<WelcomePaySetting> paySettings = welcomePaySettingService.queryPaySettings(student.getSchool());
-                if (paySettings != null && paySettings.size() > 0) {
-                    String year = TimeExchange.getYear();
-                    String payResult = HtPayUtils.getDataTwo(student.getAdmissNum(), year);
-                    if (StringUtils.hasText(payResult)) {
-                        //缴费判定
-
-                    } else {
-                        student.setIsPay(0);
-                    }
-                } else {
-                    student.setIsPay(0);
-                }
-            }
-
-        }
-        //endregion
-
         if (!(student.getIsPay() != null && student.getIsPay().intValue() == 1)) {
             System.out.println("进支付比较");
             List<JsonPayVo> payInfos = WelcomePayController.queryStudentPayInfo(student.getAdmissNum(), TimeExchange.getYear());
@@ -591,6 +574,9 @@ public class LoginController implements LoginControllerAPI {
             }
         }
 
+        if(student.getIsPay() == null){
+            student.setIsPay(0);
+        }
         long expired = 1000 * 60 * 60 * 24 * 365;
         TokenDateVo token = JWTUtil.getToken(student.getCardId(), student.getId(), expired);
         student.setToken(token.getToken());

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

@@ -745,10 +745,14 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             }
         }
 
+        if(ws.getIsPay() == null){
+            ws.setIsPay(0);
+        }
         try {
             System.out.println("信息采集1");
 
             if (ws.getId() != null) {
+
                 int update = welcomeStudentService.updateWelcomeStudent(ws);
                 if (update < 0) {
                     System.out.println("信息采集1.1");
@@ -1768,6 +1772,7 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
             } else {
                 student.setIsPay(0);
             }
+
             if (payInfos != null && payInfos.size() > 0) {
                 int update = welcomeStudentService.updateWelcomeStudent(student);
                 if (update < 0) {
@@ -1776,6 +1781,10 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 }
             }
         }
+
+        if(student.getIsPay() == null){
+            student.setIsPay(0);
+        }
         return CommonResult.ok(student);
     }
 
@@ -1883,6 +1892,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         } else {
             ws.setIsPay(0);
         }
+        if(ws.getIsPay() == null){
+            ws.setIsPay(0);
+        }
         if (!(ws.getIsPay() != null && ws.getIsPay().intValue() == 1)) {
             int updateResult = welcomeStudentService.updateWelcomeStudent(ws);
             if (updateResult < 0) {