1、收费管理排序调整

2、扫码登录调整

src/main/java/com/xjrsoft/module/student/service/impl/PbVXsxxsfytbServiceImpl.java

@@ -154,7 +154,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
                 }else if("refundmny".equals(dto.getField())){
                     pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getRefundmny);
                 }else if("qfje".equals(dto.getField())){
-                    pbVXsxxsfytbMPJLambdaWrapper.orderByAsc(PbVXsxxsfytb::getQfje);
+                    pbVXsxxsfytbMPJLambdaWrapper.orderByDesc(PbVXsxxsfytb::getQfje);
                 }
             }else if("descend".equals(dto.getOrder())){
                 if("baseSemesterCn".equals(dto.getField())){

src/main/java/com/xjrsoft/module/system/controller/LoginController.java

@@ -138,13 +138,20 @@ public class LoginController {
     @ApiOperation(value = "验证是否登录成功", notes = "验证是否登录成功")
     @XjrLog(value = "验证是否登录成功")
     public RT<LoginCheckQRCodeVo> checkLoginQRCode(@RequestBody @Valid String loginCode) {
-        String token = redisUtil.get(loginCode);
+        Long timestamp = redisUtil.get(loginCode + "time", Long.class);
+        long timeMillis = System.currentTimeMillis();
         LoginCheckQRCodeVo loginCheckQRCodeVo = new LoginCheckQRCodeVo();
-        loginCheckQRCodeVo.setToken(token);
-        loginCheckQRCodeVo.setStatus(0);
-        if(StrUtil.isEmpty(token)){
+        if(timeMillis - timestamp > 300000){
             loginCheckQRCodeVo.setStatus(1);
+            return RT.ok(loginCheckQRCodeVo);
         }
+
+        redisUtil.get(loginCode, Long.class);
+
+        String token = redisUtil.get(loginCode);
+
+        loginCheckQRCodeVo.setToken(token);
+        loginCheckQRCodeVo.setStatus(0);
         return RT.ok(loginCheckQRCodeVo);
     }
 

src/main/java/com/xjrsoft/module/system/service/impl/LoginServiceImpl.java

@@ -204,7 +204,10 @@ public class LoginServiceImpl implements ILoginService {
                 throw new MyException("登录人数超过授权人数，无法登录，请联系管理员！");
             }
         }
-
+        WeChatUserInfo mpOpenid = weChatUtil.getMpOpenid(dto.getCode());
+        if(StrUtil.isEmpty(mpOpenid.getOpenid())){
+            throw new MyException("未绑定微信公众号，无法扫码登录");
+        }
         User loginUser = userService.getOne(
             Wrappers.lambdaQuery(User.class)
             .eq(User::getOpenId, dto.getCode())

src/main/java/com/xjrsoft/module/system/vo/LoginCheckQRCodeVo.java

@@ -13,7 +13,7 @@ public class LoginCheckQRCodeVo {
     @ApiModelProperty("token")
     private String token;
 
-    @ApiModelProperty("状态（0：未失效 1：失效）")
+    @ApiModelProperty("状态（0：未失效 1：失效 2：未能绑定微信公众号）")
     private Integer status;
 
 }