Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-24 54b50b89b9f083a892e954a8401a7203af87d4a2

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -242,7 +242,7 @@
                    appUser.setTagName(byIdTag.getData().getName());
                }
            }
            if (appUser.getVipEndTime().isAfter(LocalDateTime.now())) {
            if (appUser.getVipEndTime()!=null&&appUser.getVipEndTime().isAfter(LocalDateTime.now())) {
                //匹配vipMap的值
                appUser.setVipName(vipMap.getData().get(appUser.getVipId()));
            }
@@ -250,6 +250,12 @@
            R<Long> useOrderCount = chargingOrderClient.useOrderCount(appUser.getId());
            appUser.setOrderCount(useOrderCount.getData());
            appUser.setUid(appUser.getId().toString());
            if (appUser.getCompanyId()!=null){
                TCompany data = otherClient.unitDetail(appUser.getCompanyId()).getData();
                if (data!=null){
                    appUser.setCompanyName(data.getName());
                }
            }

            TAppUserCar one1 = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, appUser.getId()).orderByDesc(BasePojo::getCreateTime).last("limit 1").one();
            if (one1!=null){
@@ -807,6 +813,8 @@
        appUserService.updateById(byId);
        return R.ok();
    }
    
    
    //已签到日期
    @ApiOperation(value = "本月已签到日期", tags = {"小程序-个人中心-签到"})
    @GetMapping(value = "/user/has/sign")
@@ -866,6 +874,10 @@
        TAppUser byId = appUserService.getById(userId);
        appUserCar.setAppUserId(userId);

        //判断当前用户是否为vip



        //如果是第一次添加车辆，增加积分
        Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();