ソースを参照

修改出现的bug

liu 15 時間 前
コミット
15668b2836

+ 13 - 2
src/main/java/com/template/controller/WelcomePayController.java

@@ -11,6 +11,7 @@ import com.template.model.vo.JsonPayVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -106,6 +107,10 @@ public class WelcomePayController implements WelcomePayControllerAPI {
     public static List<JsonPayVo> queryStudentPayInfo(String cardNo,String year) {
         String timeStr = String.valueOf(System.currentTimeMillis());
         String token = querySign(timeStr);
+        // 签名都拿不到,后面的请求必失败,直接降级
+        if (token == null || token.trim().isEmpty()) {
+            return Collections.emptyList();
+        }
 
         Map<String, String> tokenParams = new HashMap<>();
 //        tokenParams.put("sign", sds);
@@ -126,7 +131,7 @@ public class WelcomePayController implements WelcomePayControllerAPI {
         return travelers;
     }
 
-    private static String querySign(String timestr){
+    private static String querySign(String timestr) {
         String devId = "ncjt00001";
 
         Map<String, String> tokenParams = new HashMap<>();
@@ -134,7 +139,13 @@ public class WelcomePayController implements WelcomePayControllerAPI {
         tokenParams.put("timestamp", timestr);
 
         // wecode换取token
-        String sign = HttpsClient.post(urlStr +"api/getSign", tokenParams);
+        String sign = null;
+        try {
+            sign = HttpsClient.post(urlStr + "api/getSign", tokenParams);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
 
         return sign;
     }

+ 5 - 1
src/main/java/com/template/controller/WelcomeStudentController.java

@@ -1091,7 +1091,11 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                     ws.setGraduationSchool(ws.getGraduationSchool());//毕业中学
                     ws.setBatchValue(ws.getBatchValue());//层次
                     ws.setPoliticalStatu(ws.getPoliticalStatu());//政治面貌
-                    ws.setNationality(ws.getNationality());//民族
+                    if (ObjectUtils.isEmpty(ws.getNationality())) { //名族为空时,默认汉族
+                        ws.setNationality("汉");//民族
+                    }else {
+                        ws.setNationality(ws.getNationality());//民族
+                    }
                     ws.setPhone(ws.getPhone());//手机号码
                     ws.setOprovince(ws.getOprovince());
                     ws.setOprovinceId(ws.getOprovinceId());