Merge remote-tracking branch 'origin/master'

luodangjia

2024-09-10 ce19680b98669f8b4e66b2ce82fe0dcebe178445

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

@@ -51,8 +51,10 @@
        List<TAppUserVipDetail> list = appUserVipDetailService.lambdaQuery().eq(TAppUserVipDetail::getAppUserId, userId).last(" and now() between start_time and end_time order by start_time desc").list();

      for (TAppUserVipDetail tAppUserVipDetail : list) {
            TVip data = vipClient.getInfo1(tAppUserVipDetail.getVipId()).getData();
            tAppUserVipDetail.setVipName(data.getName());
            if(null != tAppUserVipDetail.getVipId()){
                TVip data = vipClient.getInfo1(tAppUserVipDetail.getVipId()).getData();
                tAppUserVipDetail.setVipName(data.getName());
            }
        }
        return R.ok(list);
   }