From bb66ef51805b58448af8edae8e6b04f153d80b5f Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期三, 04 十二月 2024 14:06:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java | 71 ++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java index 3a37e7b..2f20fc2 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/VipSettingController.java @@ -1,9 +1,13 @@ package com.ruoyi.other.controller; +import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.AppUser; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.security.service.TokenService; +import com.ruoyi.other.api.domain.VipGood; import com.ruoyi.other.api.domain.VipSetting; +import com.ruoyi.other.service.VipGoodService; import com.ruoyi.other.service.VipSettingService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -33,12 +37,72 @@ public class VipSettingController { @Resource private VipSettingService vipSettingService; - @GetMapping("/info") - @ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页"}) + @Resource + private AppUserClient appUserClient; + @Resource + private TokenService tokenService; + @Resource + private VipGoodService vipGoodService; + + @PostMapping("/info") + @ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页","小程序-会员中心"}) public R<List<VipSetting>> info(){ List<VipSetting> list = vipSettingService.list(); return R.ok(list); } + + @PostMapping("/button/agent/check") + @ApiOperation(value = "准代理,代理按钮是否展示", tags = {"小程序-个人中心首页","小程序-会员中心"}) + public R<Boolean> buttoncheck(@ApiParam("4准代理,5代理")Integer id){ + Long userid = tokenService.getLoginUserApplet().getUserid(); + AppUser appUserById = appUserClient.getAppUserById(userid); + Boolean back = true; + VipSetting byId = vipSettingService.getById(id); + //第一种判断 + if (byId == null) { + back = false; + }else { + if (byId.getVipAgentLevelUpRole() == null || byId.getVipAgentLevelUpRole() == 0) { + back = false; + } + if (byId.getVipLevelUpShop() == null || byId.getVipLevelUpShare() == null) { + back = false; + } else { + if (back && appUserById.getShopPoint().compareTo(byId.getVipLevelUpShop()) > 0 && appUserById.getSharePoint().compareTo(byId.getVipLevelUpShare()) > 0) { + back = true; + } + } + if (back) { + return R.ok(true); + } + //第二种判断 + if (byId.getVipDirectVipRole()== null || byId.getVipDirectVipRole() == 0||byId.getVipDirectVipNum() == null) { + back = false; + }else { + //拿到当前用户直推钻石会员人数 + Long data = appUserClient.getVipCount(userid, 3).getData(); + if (data>=byId.getVipDirectVipNum()){ + return R.ok(true); + } + } + //第三种判断 + List<VipGood> list = vipGoodService.lambdaQuery().eq(VipGood::getVipId, id).list(); + for (VipGood vipGood : list) { + //挨个判断是否购买商品 + + + } + + + } + + + + + + return R.ok(list); + } + @GetMapping("getVipSettingById") @@ -46,5 +110,8 @@ public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam Integer id){ return R.ok(vipSettingService.getById(id)); } + + + } -- Gitblit v1.7.1