Browse Source

1、解决统计总消费金额报错
2、修改登录二维码的地址

dzx 1 năm trước cách đây
mục cha
commit
5afa82208f

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

@@ -65,7 +65,7 @@ public class PbVXsxxsfytbServiceImpl extends MPJBaseServiceImpl<PbVXsxxsfytbMapp
 
 
         // 统计总消费金额
         // 统计总消费金额
         BigDecimal totalConsumption = pbVXsxxsfytbPersonalList.stream()
         BigDecimal totalConsumption = pbVXsxxsfytbPersonalList.stream()
-                .map(p -> p.getFactrecarmny().add(p.getArrearagemny()))
+                .map(p -> p.getFactrecarmny().add((p.getArrearagemny()==null?BigDecimal.ZERO:p.getArrearagemny())))
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
 
         // 按学期分组并处理数据
         // 按学期分组并处理数据

+ 3 - 2
src/main/java/com/xjrsoft/module/system/controller/LoginController.java

@@ -98,7 +98,8 @@ public class LoginController {
     @ApiOperation(value="登录-二维码")
     @ApiOperation(value="登录-二维码")
     @SaCheckPermission("login:detail")
     @SaCheckPermission("login:detail")
     public RT<LoginQRCodeVo> qrcode() {
     public RT<LoginQRCodeVo> qrcode() {
-        String url = commonPropertiesConfig.getDomainApp() + "/system/QR-code-login";
+        long loginCode = IdUtil.getSnowflakeNextId();
+        String url = commonPropertiesConfig.getDomainApp() + "pages/login/qrCodeLogin/index?loginCode="+loginCode;
         int width = 200;
         int width = 200;
         int height = 200;
         int height = 200;
         int margin = 1;
         int margin = 1;
@@ -107,7 +108,7 @@ public class LoginController {
             String base64 = QrCodeUtil.createBase64(url, width, height, margin);
             String base64 = QrCodeUtil.createBase64(url, width, height, margin);
             LoginQRCodeVo loginQRCodeVo = new LoginQRCodeVo();
             LoginQRCodeVo loginQRCodeVo = new LoginQRCodeVo();
             loginQRCodeVo.setImgBase64(base64);
             loginQRCodeVo.setImgBase64(base64);
-            long loginCode = IdUtil.getSnowflakeNextId();
+
             redisUtil.set(loginCode + "time", System.currentTimeMillis());
             redisUtil.set(loginCode + "time", System.currentTimeMillis());
             loginQRCodeVo.setLoginCode(loginCode + "");
             loginQRCodeVo.setLoginCode(loginCode + "");
             return RT.ok(loginQRCodeVo);
             return RT.ok(loginQRCodeVo);