优化

src/main/java/com/template/api/WelcomePayControllerAPI.java

@@ -22,12 +22,20 @@ import java.util.List;
 public interface WelcomePayControllerAPI {
 
     @GetMapping(value = "/getDatas")
-    @ApiOperation(value = "查询欠费记录")
+    @ApiOperation(value = "获取全量数据")
     CommonResult getDatas();
 
-    @GetMapping(value = "/getDataOnes")
-    @ApiOperation(value = "查询欠费记录")
-    CommonResult getDataOnes(String cardNo);
+    @GetMapping(value = "/getDataOne")
+    @ApiOperation(value = "根据学校及收费区间获取欠费")
+    CommonResult getDataOne(String cardNo,String year);
+
+    @GetMapping(value = "/getDataTwo")
+    @ApiOperation(value = "根据学号、入学年度和收费区间获取欠费")
+    CommonResult getDataTwo(String cardNo,String year);
+
+    @GetMapping(value = "/getDataThree")
+    @ApiOperation(value = "根据入学年度及收费区间获取欠费")
+    CommonResult getDataThree(String year);
 
 
 }

src/main/java/com/template/common/utils/HtPayUtils.java

@@ -0,0 +1,94 @@
+package com.template.common.utils;
+
+import com.template.annotation.PassToken;
+import com.template.model.result.CommonResult;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author: xwt
+ * @Date: 2025/6/27 星期五 9:42
+ * @Description: com.template.common.utils
+ * @Version: 1.0
+ */
+public class HtPayUtils {
+    public static String getDatas() {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataAll", tokenParams);
+
+        return respon;
+    }
+
+    //根据学校及收费区间获取欠费
+    public static String getDataOne(String cardNo, String year) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+        tokenParams.put("xh", cardNo);
+        tokenParams.put("sfqjdm", year);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataOne", tokenParams);
+
+        return respon;
+    }
+
+    //根据学号、入学年度和收费区间获取欠费
+    public static String getDataTwo(String cardNo, String year) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+        tokenParams.put("xh", cardNo);
+        tokenParams.put("sfqjdm", year);
+        tokenParams.put("rxnd", year);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataTwo", tokenParams);
+
+        return respon;
+    }
+
+    //根据入学年度及收费区间获取欠费
+    public static String getDataThree(String year) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+        tokenParams.put("sfqjdm", year);
+        tokenParams.put("rxnd", year);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataThree", tokenParams);
+
+        return respon;
+    }
+
+    private static String querySign(String timestr){
+        String devId = "ncjt00001";
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("devId", devId);
+        tokenParams.put("timestamp", timestr);
+
+        // wecode换取token
+        String sign = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getSign", tokenParams);
+
+        return sign;
+    }
+}

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

@@ -51,16 +51,18 @@ public class LoginController implements LoginControllerAPI {
     @Autowired
     private WxOpenidConfig wxOpenidConfig;
     @Resource
-    private WelcomeAccountService welcomeAccountService;
-    @Resource
-    private WelcomeStudentService welcomeStudentService;
-    @Resource
     private WelcomeOrgService welcomeOrgService;
     @Resource
     private WelcomeFamilyService welcomeFamilyService;
     @Resource
+    private WelcomeStudentService welcomeStudentService;
+    @Resource
+    private WelcomeAccountService welcomeAccountService;
+    @Resource
     private WelcomeAccompanyService welcomeAccompanyService;
     @Resource
+    private WelcomePaySettingService welcomePaySettingService;
+    @Resource
     private WelcomeArriveSettingService welcomeArriveSettingService;
 
     private static Logger logger = LoggerFactory.getLogger(LoginController.class);
@@ -465,6 +467,27 @@ 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
+
         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/WelcomePayController.java

@@ -30,6 +30,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class WelcomePayController implements WelcomePayControllerAPI {
 
+    //获取全量数据
     @Override
     @PassToken
     public CommonResult getDatas() {
@@ -46,9 +47,31 @@ public class WelcomePayController implements WelcomePayControllerAPI {
         return CommonResult.ok(respon);
     }
 
+    //根据学校及收费区间获取欠费
     @Override
     @PassToken
-    public CommonResult getDataOnes(String cardNo) {
+    public CommonResult getDataOne(String cardNo,String year) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String token = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+//        tokenParams.put("sign", token);
+//        tokenParams.put("timestamp", timeStr);
+//        tokenParams.put("xh", cardNo);
+//        tokenParams.put("sfqjdm", year);
+
+        String queryStr = "?token="+token+"=&timestamp="+timeStr+"&sfqjdm="+year+"&xh="+cardNo;
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataOne"+queryStr, tokenParams);
+
+        return CommonResult.ok(respon);
+    }
+
+    //根据学号、入学年度和收费区间获取欠费
+    @Override
+    @PassToken
+    public CommonResult getDataTwo(String cardNo,String year) {
         String timeStr = String.valueOf(System.currentTimeMillis());
         String sds = querySign(timeStr);
 
@@ -56,10 +79,30 @@ public class WelcomePayController implements WelcomePayControllerAPI {
         tokenParams.put("sign", sds);
         tokenParams.put("timestamp", timeStr);
         tokenParams.put("xh", cardNo);
-        tokenParams.put("sfqjdm", "2024");
+        tokenParams.put("sfqjdm", year);
+        tokenParams.put("rxnd", year);
+
+        // wecode换取token
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataTwo", tokenParams);
+
+        return CommonResult.ok(respon);
+    }
+
+    //根据入学年度及收费区间获取欠费
+    @Override
+    @PassToken
+    public CommonResult getDataThree(String year) {
+        String timeStr = String.valueOf(System.currentTimeMillis());
+        String sds = querySign(timeStr);
+
+        Map<String, String> tokenParams = new HashMap<>();
+        tokenParams.put("sign", sds);
+        tokenParams.put("timestamp", timeStr);
+        tokenParams.put("sfqjdm", year);
+        tokenParams.put("rxnd", year);
 
         // wecode换取token
-        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataOne", tokenParams);
+        String respon = HttpsClient.post("http://pay.ncjti.edu.cn:8068/api/getXsffDataThree", tokenParams);
 
         return CommonResult.ok(respon);
     }

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

@@ -184,42 +184,42 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
         //endregion
 
-        //region 陪同人员数据
-        List<WelcomeAccompany> was = new ArrayList<>();
-        if (isr.getAvs() != null && isr.getAvs().size() > 0) {
-            for (InsertAccompanyRequest accompany : isr.getAvs()) {
-                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
-                    return CommonResult.fail("陪同人员信息不能为空！");
-                }
-                WelcomeAccompany wa = new WelcomeAccompany();
-                wa.setStudentCard(ws.getCardId());
-                wa.setName(accompany.getName());
-                wa.setPhone(accompany.getPhone());
-                was.add(wa);
-            }
-        }
-
-        //endregion
-
-        //region 宿舍信息
-        WelcomeBed bedData = welcomeBedService.queryBedData(isr.getSchool(), isr.getBuildId(), isr.getDormitoryId(), Integer.valueOf(isr.getBed()));
-        if (bedData != null) {
-            if (StringUtils.hasText(bedData.getStudentCard())) {
-                return CommonResult.fail("当前床位已被他人入住，无法入住");
-            }
-            bedData.setStudentCard(isr.getCardId());
-            bedData.setCollege(isr.getCollege());
-            bedData.setCollegeId(isr.getCollegeId());
-            bedData.setMajor(isr.getMajor());
-            bedData.setMajorId(isr.getMajorId());
-            bedData.setClassstr(isr.getClassstr());
-            bedData.setClassstrId(isr.getClassstrId());
-            bedData.setIsCheck(1);
-            bedData.setCardNum(isr.getAdmissNum());
-            bedData.setName(isr.getName());
-        }
-
-        //endregion
+//        //region 陪同人员数据
+//        List<WelcomeAccompany> was = new ArrayList<>();
+//        if (isr.getAvs() != null && isr.getAvs().size() > 0) {
+//            for (InsertAccompanyRequest accompany : isr.getAvs()) {
+//                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
+//                    return CommonResult.fail("陪同人员信息不能为空！");
+//                }
+//                WelcomeAccompany wa = new WelcomeAccompany();
+//                wa.setStudentCard(ws.getCardId());
+//                wa.setName(accompany.getName());
+//                wa.setPhone(accompany.getPhone());
+//                was.add(wa);
+//            }
+//        }
+//
+//        //endregion
+//
+//        //region 宿舍信息
+//        WelcomeBed bedData = welcomeBedService.queryBedData(isr.getSchool(), isr.getBuildId(), isr.getDormitoryId(), Integer.valueOf(isr.getBed()));
+//        if (bedData != null) {
+//            if (StringUtils.hasText(bedData.getStudentCard())) {
+//                return CommonResult.fail("当前床位已被他人入住，无法入住");
+//            }
+//            bedData.setStudentCard(isr.getCardId());
+//            bedData.setCollege(isr.getCollege());
+//            bedData.setCollegeId(isr.getCollegeId());
+//            bedData.setMajor(isr.getMajor());
+//            bedData.setMajorId(isr.getMajorId());
+//            bedData.setClassstr(isr.getClassstr());
+//            bedData.setClassstrId(isr.getClassstrId());
+//            bedData.setIsCheck(1);
+//            bedData.setCardNum(isr.getAdmissNum());
+//            bedData.setName(isr.getName());
+//        }
+//
+//        //endregion
 
         try {
 
@@ -237,19 +237,19 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 }
             }
 
-            if (was != null && was.size() > 0) {
-                boolean insertBatch = welcomeAccompanyService.saveBatch(was);
-                if (!insertBatch) {
-                    logger.error("添加陪同人员失败，参数：" + JSON.toJSON(was));
-                    throw new Exception("添加失败！");
-                }
-            }
-
-            int insertStudentDormitory = welcomeBedService.updateWelcomeBed(bedData);
-            if (insertStudentDormitory <= 0) {
-                logger.error("添加学生床位信息失败，参数：" + JSON.toJSON(bedData));
-                throw new Exception("添加失败！");
-            }
+//            if (was != null && was.size() > 0) {
+//                boolean insertBatch = welcomeAccompanyService.saveBatch(was);
+//                if (!insertBatch) {
+//                    logger.error("添加陪同人员失败，参数：" + JSON.toJSON(was));
+//                    throw new Exception("添加失败！");
+//                }
+//            }
+//
+//            int insertStudentDormitory = welcomeBedService.updateWelcomeBed(bedData);
+//            if (insertStudentDormitory <= 0) {
+//                logger.error("添加学生床位信息失败，参数：" + JSON.toJSON(bedData));
+//                throw new Exception("添加失败！");
+//            }
         } catch (Exception e) {
             logger.error(e.getMessage());
             throw new Exception("添加失败！");
@@ -339,75 +339,75 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         }
         //endregion
 
-        //region 陪同人员数据
-        List<WelcomeAccompany> was = new ArrayList<>();
-        if (usr.getAvs() != null && usr.getAvs().size() > 0) {
-            for (InsertAccompanyRequest accompany : usr.getAvs()) {
-                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
-                    return CommonResult.fail("陪同人员信息不能为空！");
-                }
-                WelcomeAccompany wa = new WelcomeAccompany();
-                wa.setStudentCard(student.getCardId());
-                wa.setName(accompany.getName());
-                wa.setPhone(accompany.getPhone());
-                was.add(wa);
-            }
-        }
-
-        //endregion
-
-        //region 宿舍信息
-        List<WelcomeBed> bedDatas = new ArrayList<>();
-        WelcomeBed bedData = welcomeBedService.queryBedData(usr.getSchool(), usr.getBuildId(), usr.getDormitoryId(), Integer.valueOf(usr.getBed()));
-        if (bedData != null) {//新床位
-            if (StringUtils.hasText(bedData.getStudentCard()) && !bedData.getStudentCard().equals(student.getCardId())) {
-                return CommonResult.fail("当前床位已被他人入住，无法入住");
-            }
-            if (!StringUtils.hasText(bedData.getStudentCard())) {
-                bedData.setStudentCard(student.getCardId());
-                bedData.setCollege(student.getCollege());
-                bedData.setCollegeId(student.getCollegeId());
-                bedData.setMajor(student.getMajor());
-                bedData.setMajorId(student.getMajorId());
-                bedData.setClassstr(student.getClassstr());
-                bedData.setClassstrId(student.getClassstrId());
-                bedData.setIsCheck(1);
-                bedData.setCardNum(student.getAdmissNum());
-                bedData.setName(student.getName());
-
-                //把旧床位清空
-                WelcomeBed obedData = welcomeBedService.getBedByCardId(student.getCardId());
-                if (obedData == null) {
-                    obedData = new WelcomeBed();
-                    obedData.setStudentCard(null);
-                    obedData.setCollege(null);
-                    obedData.setCollegeId(null);
-                    obedData.setMajor(null);
-                    obedData.setMajorId(null);
-                    obedData.setClassstr(null);
-                    obedData.setClassstrId(null);
-                    obedData.setIsCheck(0);
-                    obedData.setCardNum(null);
-                    obedData.setName(null);
-                    bedDatas.add(obedData);
-                }
-            } else {
-                bedData.setStudentCard(student.getCardId());
-                bedData.setCollege(student.getCollege());
-                bedData.setCollegeId(student.getCollegeId());
-                bedData.setMajor(student.getMajor());
-                bedData.setMajorId(student.getMajorId());
-                bedData.setClassstr(student.getClassstr());
-                bedData.setClassstrId(student.getClassstrId());
-                bedData.setIsCheck(1);
-                bedData.setCardNum(student.getAdmissNum());
-                bedData.setName(student.getName());
-            }
-            bedDatas.add(bedData);
-
-        }
-
-        //endregion
+//        //region 陪同人员数据
+//        List<WelcomeAccompany> was = new ArrayList<>();
+//        if (usr.getAvs() != null && usr.getAvs().size() > 0) {
+//            for (InsertAccompanyRequest accompany : usr.getAvs()) {
+//                if (!(StringUtils.hasText(accompany.getName()) && StringUtils.hasText(accompany.getPhone()))) {
+//                    return CommonResult.fail("陪同人员信息不能为空！");
+//                }
+//                WelcomeAccompany wa = new WelcomeAccompany();
+//                wa.setStudentCard(student.getCardId());
+//                wa.setName(accompany.getName());
+//                wa.setPhone(accompany.getPhone());
+//                was.add(wa);
+//            }
+//        }
+//
+//        //endregion
+//
+//        //region 宿舍信息
+//        List<WelcomeBed> bedDatas = new ArrayList<>();
+//        WelcomeBed bedData = welcomeBedService.queryBedData(usr.getSchool(), usr.getBuildId(), usr.getDormitoryId(), Integer.valueOf(usr.getBed()));
+//        if (bedData != null) {//新床位
+//            if (StringUtils.hasText(bedData.getStudentCard()) && !bedData.getStudentCard().equals(student.getCardId())) {
+//                return CommonResult.fail("当前床位已被他人入住，无法入住");
+//            }
+//            if (!StringUtils.hasText(bedData.getStudentCard())) {
+//                bedData.setStudentCard(student.getCardId());
+//                bedData.setCollege(student.getCollege());
+//                bedData.setCollegeId(student.getCollegeId());
+//                bedData.setMajor(student.getMajor());
+//                bedData.setMajorId(student.getMajorId());
+//                bedData.setClassstr(student.getClassstr());
+//                bedData.setClassstrId(student.getClassstrId());
+//                bedData.setIsCheck(1);
+//                bedData.setCardNum(student.getAdmissNum());
+//                bedData.setName(student.getName());
+//
+//                //把旧床位清空
+//                WelcomeBed obedData = welcomeBedService.getBedByCardId(student.getCardId());
+//                if (obedData == null) {
+//                    obedData = new WelcomeBed();
+//                    obedData.setStudentCard(null);
+//                    obedData.setCollege(null);
+//                    obedData.setCollegeId(null);
+//                    obedData.setMajor(null);
+//                    obedData.setMajorId(null);
+//                    obedData.setClassstr(null);
+//                    obedData.setClassstrId(null);
+//                    obedData.setIsCheck(0);
+//                    obedData.setCardNum(null);
+//                    obedData.setName(null);
+//                    bedDatas.add(obedData);
+//                }
+//            } else {
+//                bedData.setStudentCard(student.getCardId());
+//                bedData.setCollege(student.getCollege());
+//                bedData.setCollegeId(student.getCollegeId());
+//                bedData.setMajor(student.getMajor());
+//                bedData.setMajorId(student.getMajorId());
+//                bedData.setClassstr(student.getClassstr());
+//                bedData.setClassstrId(student.getClassstrId());
+//                bedData.setIsCheck(1);
+//                bedData.setCardNum(student.getAdmissNum());
+//                bedData.setName(student.getName());
+//            }
+//            bedDatas.add(bedData);
+//
+//        }
+//
+//        //endregion
 
         try {
 
@@ -426,20 +426,20 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
                 }
             }
 
-            int deleteA = welcomeAccompanyService.deleteWelcomeAccompanyByCard(student.getCardId());
-            if (was != null && was.size() > 0) {
-                boolean insertBatch = welcomeAccompanyService.saveBatch(was);
-                if (!insertBatch) {
-                    logger.error("编辑陪同人员失败，参数：" + JSON.toJSON(was));
-                    throw new Exception("编辑失败！");
-                }
-            }
-
-            boolean updateBatch = welcomeBedService.updateBatchById(bedDatas);
-            if (!updateBatch) {
-                logger.error("添加宿舍信息失败，参数：" + JSON.toJSON(bedDatas));
-                throw new Exception("添加失败！");
-            }
+//            int deleteA = welcomeAccompanyService.deleteWelcomeAccompanyByCard(student.getCardId());
+//            if (was != null && was.size() > 0) {
+//                boolean insertBatch = welcomeAccompanyService.saveBatch(was);
+//                if (!insertBatch) {
+//                    logger.error("编辑陪同人员失败，参数：" + JSON.toJSON(was));
+//                    throw new Exception("编辑失败！");
+//                }
+//            }
+//
+//            boolean updateBatch = welcomeBedService.updateBatchById(bedDatas);
+//            if (!updateBatch) {
+//                logger.error("添加宿舍信息失败，参数：" + JSON.toJSON(bedDatas));
+//                throw new Exception("添加失败！");
+//            }
 
         } catch (Exception e) {
             logger.error(e.getMessage());

src/main/java/com/template/model/pojo/WelcomeStudent.java

@@ -198,6 +198,11 @@ public class WelcomeStudent implements Serializable {
     @TableField(exist = false)
     private List<ArriveTimeVo> atvs;
 
+    //0：未缴费
+    //1：已缴费
+    @ApiModelProperty(value = "是否已缴费")
+    @TableField(exist = false)
+    private Integer isPay;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

src/main/java/com/template/model/request/InsertStudentRequest.java

@@ -37,7 +37,7 @@ public class InsertStudentRequest implements Serializable {
     private String picture;
 
     @ApiModelProperty(value = "身份证号")
-	@NotBlank(message = "身份证号不能为空")
+    @NotBlank(message = "身份证号不能为空")
     private String cardId;
 
     @ApiModelProperty(value = "性别")
@@ -49,7 +49,7 @@ public class InsertStudentRequest implements Serializable {
     private String birthday;
 
     @ApiModelProperty(value = "校区Id")
-	@NotNull(message = "校区ID不能为空")
+    @NotNull(message = "校区ID不能为空")
     private Integer schoolId;
 
     @ApiModelProperty(value = "校区")
@@ -202,28 +202,27 @@ public class InsertStudentRequest implements Serializable {
 
     //家庭成员
     private List<InsertFamilyRequest> fvs;
-
-    //陪同人员
-    private List<InsertAccompanyRequest> avs;
-
-    //楼栋
-    private String build;
-
-    //楼栋ID
-    private Integer buildId;
-
-    //寝室号
-    private String dormitory;
-
-    //寝室ID
-    private Integer dormitoryId;
-
-    //床位号
-    private String bed;
-
-    //床位ID
-    private Integer bedId;
-
+//
+//    //陪同人员
+//    private List<InsertAccompanyRequest> avs;
+//
+//    //楼栋
+//    private String build;
+//
+//    //楼栋ID
+//    private Integer buildId;
+//
+//    //寝室号
+//    private String dormitory;
+//
+//    //寝室ID
+//    private Integer dormitoryId;
+//
+//    //床位号
+//    private String bed;
+//
+//    //床位ID
+//    private Integer bedId;
 
 
 }

src/main/java/com/template/model/request/updateStudentRequest.java

@@ -201,26 +201,26 @@ public class updateStudentRequest implements Serializable {
 
     //家庭成员
     private List<InsertFamilyRequest> fvs;
-
-    //陪同人员
-    private List<InsertAccompanyRequest> avs;
-
-    //楼栋
-    private String build;
-
-    //楼栋
-    private Integer buildId;
-
-    //寝室号
-    private String dormitory;
-
-    //寝室号
-    private Integer dormitoryId;
-
-    //床位号
-    private String bed;
-
-    //床位号
-    private Integer bedId;
+//
+//    //陪同人员
+//    private List<InsertAccompanyRequest> avs;
+//
+//    //楼栋
+//    private String build;
+//
+//    //楼栋
+//    private Integer buildId;
+//
+//    //寝室号
+//    private String dormitory;
+//
+//    //寝室号
+//    private Integer dormitoryId;
+//
+//    //床位号
+//    private String bed;
+//
+//    //床位号
+//    private Integer bedId;
 
 }

src/main/java/com/template/model/vo/wxLoginVo.java

@@ -145,6 +145,12 @@ public class wxLoginVo {
     @ApiModelProperty(value = "实付金额")
     private BigDecimal payAmount;
 
+    //0：未缴费
+    //1：已缴费
+    @ApiModelProperty(value = "是否已缴费")
+    @TableField(exist = false)
+    private Integer isPay;
+
     @ApiModelProperty(value = "是否自驾")
     private Integer isDrive;
 

src/main/java/com/template/services/WelcomePaySettingService.java

@@ -5,6 +5,8 @@ import com.template.model.pojo.WelcomePaySetting;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -25,4 +27,6 @@ public interface WelcomePaySettingService extends IService<WelcomePaySetting> {
     WelcomePaySetting getManageById(String id);
 
     int deleteAll();
+
+    List<WelcomePaySetting> queryPaySettings(String school);
 }

src/main/java/com/template/services/impl/WelcomePaySettingServiceImpl.java

@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -67,4 +69,13 @@ public class WelcomePaySettingServiceImpl extends ServiceImpl<WelcomePaySettingM
         int result = welcomePaySettingMapper.delete(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<WelcomePaySetting> queryPaySettings(String school) {
+        QueryWrapper<WelcomePaySetting> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("school",school);
+        queryWrapper.eq("is_check",1);
+        List<WelcomePaySetting> result = welcomePaySettingMapper.selectList(queryWrapper);
+        return result;
+    }
 }