1、修改移动端人员基础信息获取接口从微校获取

src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayOrderController.java

@@ -288,7 +288,7 @@ public class PayOrderController {
      * @throws IOException
      */
     @RequestMapping("exportOrderTxtQuarter")
-    public void exportOrderTxtQuarter( HttpServletResponse response, String type) throws IOException {
+    public void exportOrderTxtQuarter( HttpServletResponse response, String type ) throws IOException {
         try {
             payOrderService.exportOrderTxtQuarter(response, type);
         } catch (Exception e) {

src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/PayableInfoController.java

@@ -939,25 +939,47 @@ public class PayableInfoController {
     @GetMapping("getUserInfo")
     public CommonResult<StudentInfoVO> getUserInfo(@RequestParam("studentName") String studentName, @RequestParam("idCard") String idCard) {
         StudentInfoVO studentInfoVO = new StudentInfoVO();
-        QueryWrapper<PayableInfoEntity> info = new QueryWrapper<>();
-        QueryWrapper<PayableInfoWaterEntity> water = new QueryWrapper<>();
-        info.eq("student_name", studentName)
-                .eq("student_no", idCard)
-                .last("limit 1");
-        water.eq("student_name", studentName)
-                .eq("student_no", idCard)
-                .last("limit 1");
-        PayableInfoEntity infoOne = payableInfoService.getOne(info);
-        PayableInfoWaterEntity waterOne = payableInfoWaterService.getOne(water);
-        if (waterOne != null) {
-            studentInfoVO.setCardNumber(waterOne.getCardNumber());
-            studentInfoVO.setStudentName(waterOne.getStudentName());
-        }
+//        QueryWrapper<SchoolUser> wrapper = new QueryWrapper<>();
+//
+//        wrapper.eq("id_card", idCard)
+//                .eq("name", studentName);
+//        List<SchoolUser> list = schoolUserService.list(wrapper);
+//        list.forEach(s->{
+//            System.out.println(s);
+//        });
+//        if (list.size() > 0) {
+//            SchoolUser schoolUser = list.get(0);
+//            studentInfoVO.setCardNumber(schoolUser.getCardNumber());
+//            studentInfoVO.setStudentName(schoolUser.getName());
+//
+//        }
 
-        if (infoOne != null) {
-            studentInfoVO.setCardNumber(infoOne.getCardNumber());
-            studentInfoVO.setStudentName(infoOne.getStudentName());
-        }
+        String userCardNumber = wechatController.getUserCardNumber(studentName, idCard);
+        studentInfoVO.setCardNumber(userCardNumber);
+        studentInfoVO.setStudentName(studentName);
+//        String idCard = wechatController.getIdCard(cardNumber);
+//        payableInfoStudentResultVO.setStudentName(name);
+//        payableInfoStudentResultVO.setIdCard(idCard);
+//
+//        QueryWrapper<PayableInfoEntity> info = new QueryWrapper<>();
+//        QueryWrapper<PayableInfoWaterEntity> water = new QueryWrapper<>();
+//        info.eq("student_name", studentName)
+//                .eq("student_no", idCard)
+//                .last("limit 1");
+//        water.eq("student_name", studentName)
+//                .eq("student_no", idCard)
+//                .last("limit 1");
+//        PayableInfoEntity infoOne = payableInfoService.getOne(info);
+//        PayableInfoWaterEntity waterOne = payableInfoWaterService.getOne(water);
+//        if (waterOne != null) {
+//            studentInfoVO.setCardNumber(waterOne.getCardNumber());
+//            studentInfoVO.setStudentName(waterOne.getStudentName());
+//        }
+//
+//        if (infoOne != null) {
+//            studentInfoVO.setCardNumber(infoOne.getCardNumber());
+//            studentInfoVO.setStudentName(infoOne.getStudentName());
+//        }
         return CommonResult.ok().setResult(studentInfoVO);
     }
 }

src/main/java/com/chuanghai/smartschool/tuitionpayment/controller/WechatController.java

@@ -362,12 +362,12 @@ public class WechatController {
 
 
     /**
-     * 通过学生姓名 身份证查找用户的cardNumber
+         * 通过card_number查询身份证
      *
      * @param cardNumber
      * @return
      */
-    @GetMapping("getWeiXiaoToken1")
+    @GetMapping("getIdCard")
     @ResponseBody
     public String getIdCard(String cardNumber) {
 
@@ -398,6 +398,56 @@ public class WechatController {
     }
 
 
+
+    /**
+     * 通过学生姓名 身份证查找用户的cardNumber
+     *
+     * @param studentName
+     * @param idCard
+     * @return
+     */
+    @GetMapping("getUserCardNumber")
+    @ResponseBody
+    public String getUserCardNumber(String studentName, String idCard) {
+
+        RestTemplate client = new RestTemplate();
+        ObjectMapper mapper = new ObjectMapper();
+        String userInfoUrl = "https://open.wecard.qq.com/cgi-bin/user/search";
+        Map<String, String> userInfoParam = new HashMap<>();
+        userInfoParam.put("access_token", accessTokenPublic);
+        userInfoParam.put("keywords", studentName);
+        ResponseEntity<String> userInfoResponse = client.postForEntity(userInfoUrl, userInfoParam, String.class);
+        JSONObject jsonObj = JSON.parseObject(userInfoResponse.getBody());
+        JSONArray userlist = jsonObj.getJSONArray("userlist");
+        String id_card = "";
+        String card_numbner = "";
+        if (userlist.size() > 0) {
+            for (int m = 0; m < userlist.size(); m++) {
+                System.out.println(userlist.get(m));
+                try {
+                    Map<String, Object> userInfoMap = mapper.readValue(userlist.get(m).toString(), new TypeReference<Map<String, Object>>() {
+                    });
+                    //匹配传递的参数，匹配成功则返回相应的card_number
+                    if (userInfoMap.get("id_card") != null) {
+                        if (userInfoMap.get("id_card").toString().equals(idCard)) {
+                            if (userInfoMap.get("card_number") != null){
+                                card_numbner = userInfoMap.get("card_number").toString();
+                            }
+                        }
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return card_numbner;
+    }
+
+
+
+
+
     public PayableInfoStudentResultVO queryStudent() {
         PayableInfoStudentResultVO payableInfoStudentResultVO = new PayableInfoStudentResultVO();
         try {
@@ -464,7 +514,7 @@ public class WechatController {
         weixiaoVO.setCardNumberList(cardNumberList);
         weixiaoVO.setTitle(itemName + "缴纳通知");
         weixiaoVO.setSender("南昌交通学院");
-        weixiaoVO.setContent("您有一笔" + itemName + "账单，请在尽快缴纳");
+        weixiaoVO.setContent("您有一笔" + itemName + "账单，请尽快缴纳");
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(weixiaoVO);
         return notice(jsonObject);
     }
@@ -505,7 +555,7 @@ public class WechatController {
         weixiaoVO.setCardNumberList(cardNumberList);
         weixiaoVO.setTitle(itemName + "催缴通知");
         weixiaoVO.setSender("南昌交通学院");
-        weixiaoVO.setContent("您有一笔" + itemName + "账单，请在尽快缴纳");
+        weixiaoVO.setContent("您有一笔" + itemName + "账单，请尽快缴纳");
         JSONObject json = (JSONObject) JSONObject.toJSON(weixiaoVO);
         return notice(json);
 
@@ -643,7 +693,7 @@ public class WechatController {
             weixiaoVO.setCardNumberList(cardNumberList);
             weixiaoVO.setCardNumberList(cardNumberList);
             weixiaoVO.setSender("南昌交通学院");
-            weixiaoVO.setContent("您有一笔" + itemName + "账单，请在尽快缴纳");
+            weixiaoVO.setContent("您有一笔" + itemName + "账单，请尽快缴纳");
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(weixiaoVO);
             return notice(jsonObject);
         } else {
@@ -665,7 +715,7 @@ public class WechatController {
                 weixiaoVO.setCardNumberList(cardNumberList);
                 weixiaoVO.setCardNumberList(cardNumberList);
                 weixiaoVO.setSender("南昌交通学院");
-                weixiaoVO.setContent("您有一笔" + itemName + "账单，请在尽快缴纳");
+                weixiaoVO.setContent("您有一笔" + itemName + "账单，请尽快缴纳");
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(weixiaoVO);
                 return notice(jsonObject);
             }

src/main/java/com/chuanghai/smartschool/tuitionpayment/service/impl/PayOrderServiceImpl.java

@@ -393,8 +393,8 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
             OrderReceiveTO orderReceiveTO = orderReceiveTOS.get(m);
             String cardNumber1 = orderReceiveTO.getCardNumber();
             PayOrderReceiveVO payOrderReceiveVO1 = orderReceiveTO.getPayOrderReceiveVO();
-            System.out.println("00000000000000000000000000000000");
-            System.out.println(payOrderReceiveVO1 );
+         //   System.out.println("00000000000000000000000000000000");
+        //    System.out.println(payOrderReceiveVO1 );
             String studentNo = payOrderReceiveVO1.getStudentNo();
             String dorm = payOrderReceiveVO1.getDorm();
             if (dorm == null || dorm.equals("")) {
@@ -577,7 +577,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                     wrapper1.eq(StringUtils.hasText(payYear), "pay_year", payYear);
                     wrapper1.eq("status", "2");
                     List<PayOrderEntity> payOrderList = this.list(wrapper1);
-                    System.out.println(payOrderList.size()+"    sajsa    size");
+                   // System.out.println(payOrderList.size()+"    sajsa    size");
                     for (int i = 0; i < payOrderList.size(); i++) {
 
                         parentOrderLone = parentOrderLone.add(payOrderList.get(i).getPayOrderLoan()).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -585,17 +585,17 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                     }
 
                     BigDecimal notPayDetailAmount = payInfoDetailVO.getNotPayDetailAmount();
-                    System.out.println(payOrderEntity.getRealPayAmount());
-                    System.out.println(parentNowPayDetailAmount);
-                    System.out.println(notPayDetailAmount);
-                    System.out.println(parentOrderLone);
-                    System.out.println(payableInfo);
+//                    System.out.println(payOrderEntity.getRealPayAmount());
+//                    System.out.println(parentNowPayDetailAmount);
+//                    System.out.println(notPayDetailAmount);
+//                    System.out.println(parentOrderLone);
+//                    System.out.println(payableInfo);
                     if (itemName.equals("水费缴纳")) {
                         payOrderEntity.setNowPayAmount(payableInfoWater.getRealPayAmount());
                     }else {
                         if (payableInfo.getPayDetail() == null || payableInfo.getPayDetail().equals("")) {
-                            System.out.println("1111111111111111111");
-                            System.out.println(payInfoDetailVO);
+                         //   System.out.println("1111111111111111111");
+                         //   System.out.println(payInfoDetailVO);
                             payOrderEntity.setNowPayAmount(
                                     payOrderEntity.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP)
                                             /// .subtract(parentNowPayDetailAmount).setScale(2, BigDecimal.ROUND_HALF_UP)
@@ -603,11 +603,11 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                                             .subtract(parentOrderLone)
                                     //.subtract(payInfoDetailVO.getPayDetailAmount())
                             );
-                            System.out.println( payOrderEntity.getNowPayAmount()+"1111111111111111111111111111111");
+                         //   System.out.println( payOrderEntity.getNowPayAmount()+"1111111111111111111111111111111");
 
                         }else {
-                            System.out.println("222222222222222222222");
-                            System.out.println(payInfoDetailVO);
+                          //  System.out.println("222222222222222222222");
+                         //   System.out.println(payInfoDetailVO);
                             if ( payOrderReceiveVO1.getItemName().equals("学杂费") && !(payOrderReceiveVO1.getPayDetail().contains("/"))) {
                                 payOrderEntity.setNowPayAmount(
                                         payOrderEntity.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP)
@@ -618,7 +618,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
 
                                         //.subtract(payInfoDetailVO.getPayDetailAmount())
                                 );
-                                System.out.println("+++++++++++++++++++++++++++   "+payInfoDetailVO.getNotPayDetailAmount().subtract(parentNowPayDetailAmount).subtract(parentOrderLone));
+                             //   System.out.println("+++++++++++++++++++++++++++   "+payInfoDetailVO.getNotPayDetailAmount().subtract(parentNowPayDetailAmount).subtract(parentOrderLone));
                             }else {
                                 payOrderEntity.setNowPayAmount(
                                         payOrderEntity.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP)
@@ -629,18 +629,18 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                                 );
                             }
 
-                            System.out.println( payOrderEntity.getNowPayAmount()+"          222222222222222222222");
+                        //    System.out.println( payOrderEntity.getNowPayAmount()+"          222222222222222222222");
 
                         }
                     }
 
-                    System.out.println( payOrderEntity.getNowPayAmount()+"hyuwsegufgwf");
+                   // System.out.println( payOrderEntity.getNowPayAmount()+"hyuwsegufgwf");
                 } else {
                     // payOrderEntity.setNowPayAmount(payInfoDetailVO.getPayDetailAmount().subtract(payOrderEntity.getPayOrderLoan().setScale(2, BigDecimal.ROUND_HALF_UP)));
-                    System.out.println("3333333333333333333333333333");
-                    System.out.println(payInfoDetailVO);
+                 //   System.out.println("3333333333333333333333333333");
+                  //  System.out.println(payInfoDetailVO);
                     payOrderEntity.setNowPayAmount(payInfoDetailVO.getPayDetailAmount().setScale(2, BigDecimal.ROUND_HALF_UP).subtract(orderLoan));
-                    System.out.println(payOrderEntity.getNowPayAmount()+"           33333333333333333");
+                  //  System.out.println(payOrderEntity.getNowPayAmount()+"           33333333333333333");
                 }
                 //  System.out.println(payOrderEntity.getNowPayAmount()+"     sjdhfuhsbdf getNowPayAmount");
                 //校验订单的支付金额是否异常
@@ -655,36 +655,36 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                     orderLoan = orderLoan.add(parentOrderLone);
                     BigDecimal nowPayAllMount = BigDecimal.ZERO;
                     if (count > 1) {
-                        System.out.println(payInfoDetailVO);
+                      //  System.out.println(payInfoDetailVO);
                         if (payableInfo.getPayDetail() == null || payableInfo.getPayDetail().equals("")) {
                             nowPayAllMount = nowPayAllMount.add(payInfoDetailVO.getNotPayDetailAmount()).add(payOrderEntity.getNowPayAmount());
 
                         }else {
-                            System.out.println("4444444444444444444444");
+                      //      System.out.println("4444444444444444444444");
                             nowPayAllMount = nowPayAllMount.add(payInfoDetailVO.getNotPayDetailAmount()).add(payOrderEntity.getNowPayAmount().add(orderLoan));
 
                         }
                        // nowPayAllMount = nowPayAllMount.add(payOrderEntity.getNowPayAmount().add(parentNowPayDetailAmount).add(orderLoan));
 
                     }else {
-                        System.out.println("555555555555555555555");
+                    //    System.out.println("555555555555555555555");
                         nowPayAllMount = nowPayAllMount.add(payInfoDetailVO.getNotPayDetailAmount()).add(payOrderEntity.getNowPayAmount().add(parentNowPayDetailAmount).add(orderLoan));
                     }
 
                     BigDecimal realAmount = (payableInfo.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
                     flag = nowPayAllMount.compareTo(realAmount) == 0 ? Boolean.TRUE : Boolean.FALSE;
-                    System.out.println(flag + "=====1=====" + nowPayAllMount + "------nowPayAllMount------realAmount------" + realAmount);
+                 //   System.out.println(flag + "=====1=====" + nowPayAllMount + "------nowPayAllMount------realAmount------" + realAmount);
                 }
 
                 if (Double.parseDouble(String.valueOf(payOrderEntity.getNowPayAmount())) < 0.00) {
                     flag = Boolean.FALSE;
-                    System.out.println(flag + "=====2=====" + payOrderEntity.getNowPayAmount());
+                  //  System.out.println(flag + "=====2=====" + payOrderEntity.getNowPayAmount());
 
                 }
 
                 if (!(realPayAmount.compareTo(payOrderEntity.getNowPayAmount()) == 0)) {
                     flag = Boolean.FALSE;
-                    System.out.println(flag+"--------------"+realPayAmount + "===realPayAmount==3=====" + payOrderEntity.getNowPayAmount());
+                   // System.out.println(flag+"--------------"+realPayAmount + "===realPayAmount==3=====" + payOrderEntity.getNowPayAmount());
 
                 }
                 if (!flag) {
@@ -707,7 +707,6 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
             createOrderResultVO.setOrderNo(payOrderEntity.getOrderNo());
             createOrderResultVO.setPayMethod(payOrderEntity.getPayMethod());
             createOrderResultVO.setBankId(payOrderReceiveVO1.getBankId());
-            System.out.println(createOrderResultVO.getMsg() + "------------------------------------msg");
             createOrderResultVOList.add(createOrderResultVO);
         }
 
@@ -885,7 +884,6 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
      */
     @Override
     public void exportOrderTxtQuarter(HttpServletResponse response, String type) throws IOException {
-
         QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
 
         if (type.equals("quarter")) {
@@ -893,9 +891,13 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
                     .le("finish_time", LocalDateTime.now())
                     .ge("finish_time", LocalDateTime.now().plusMinutes(-15L));
         }else if ( type.equals("today") ){
-            wrapper.eq("status", "2")
-                    .le("finish_time", LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MAX))
-                    .ge("finish_time", LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN));
+
+                wrapper.eq("status", "2")
+                        .le("finish_time", LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MAX))
+                        .ge("finish_time", LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN));
+
+
+
         }
 
 

src/main/resources/application.yml

@@ -5,11 +5,11 @@ server:
 spring:
   datasource:
     username: root
-#    password: Chuanghai_2022.
-#    url: jdbc:mysql://172.16.20.64:3306/tuition_payment?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+    password: Chuanghai_2022.
+    url: jdbc:mysql://172.16.20.64:3306/tuition_payment?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: root
-    url: jdbc:mysql://127.0.0.1:3306/tuition_payment?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    password: root
+#    url: jdbc:mysql://127.0.0.1:3306/tuition_payment?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
 
   #配置文件传输的大小
   servlet: