Merge remote-tracking branch 'origin/master'

xuhy

2024-11-04 c0211a20f4f2d94fe1ac7657284504afa876b8a0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java

@@ -93,6 +93,11 @@
        return R.ok(vipService.getById(id));
    }

    @GetMapping(value = "/getVipList")
    public R<List<TVip>> getVipList(){
        return  R.ok(vipService.lambdaQuery().eq(TVip::getReveal, 1).list());
    }

    /**
     * 远程调用
     * @param id
@@ -243,7 +248,8 @@
           GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
           getAppUserVipDetail.setAppUserId(userId);
           getAppUserVipDetail.setVipId(data.getVipId());
           TAppUserVipDetail data1 = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail).getData();
           R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
           TAppUserVipDetail data1 = appUserVipDetail.getData();
           String vipJson = data1.getVipJson();
           TVip tVip = JSON.parseObject(vipJson, TVip.class);
           vips.add(tVip);
@@ -301,8 +307,10 @@
               vipInfoDto.setTotalDiscount(total);

               vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
               vipInfoDtos.add(vipInfoDto);
               }
               vipInfoDto.setType(vip.getType());
               vipInfoDtos.add(vipInfoDto);

           }
           return R.ok(vipInfoDtos);