From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java |  188 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 164 insertions(+), 24 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 64ea8c6..3a319a7 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -2,14 +2,24 @@
 
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.account.api.dto.SendCouponDto;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.feignClient.AppUserVipDetailClient;
+import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserVipDetail;
+import com.ruoyi.account.api.vo.GetAppUserVipDetail;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.BasePage;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.TCoupon;
 import com.ruoyi.other.api.domain.TIntegralRule;
@@ -52,6 +62,9 @@
     private TCouponService couponService;
     @Resource
     private TokenService tokenService;
+    
+    
+    @RequiresPermissions(value = {"/vipSetting/addOrdinaryMember", "/vipSetting/addInternalMember"}, logical = Logical.OR)
     @PostMapping("/saveVip")
     @ApiOperation(tags = {"管理后台-会员管理"},value = "会员添加")
     @Log(title = "【会员管理】添加会员", businessType = BusinessType.INSERT)
@@ -59,6 +72,9 @@
         vipService.save(dto);
         return AjaxResult.success();
     }
+    
+    
+    @RequiresPermissions(value = {"/vipSetting/del"}, logical = Logical.OR)
     @GetMapping("/delete")
     @ApiOperation(tags = {"管理后台-会员管理"},value = "会员删除")
     @Log(title = "【会员管理】删除会员", businessType = BusinessType.DELETE)
@@ -66,6 +82,9 @@
         vipService.removeBatchByIds(Arrays.asList(ids.split(",")));
         return AjaxResult.success();
     }
+    
+    
+    @RequiresPermissions(value = {"/vipSetting/update"}, logical = Logical.OR)
     @PostMapping("/updateVip")
     @ApiOperation(tags = {"管理后台-会员管理"},value = "会员修改")
     @Log(title = "【会员管理】修改会员", businessType = BusinessType.UPDATE)
@@ -73,6 +92,9 @@
             vipService.updateById(dto);
         return AjaxResult.success();
     }
+    
+    
+    @RequiresPermissions(value = {"/vipSetting/select"}, logical = Logical.OR)
     @GetMapping("/getInfo")
     @ApiOperation(tags = {"管理后台-会员管理"},value = "会员查看详情")
     public AjaxResult<TVip> getInfo(Integer id) {
@@ -86,6 +108,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
@@ -95,16 +122,23 @@
     public R<TVip> getInfo1(@RequestParam("id")Integer id) {
         return R.ok(vipService.getById(id));
     }
-
-
-
-
+    @PostMapping("/getAllVip")
+    R<List<TVip>> getAllVip() {
+        return R.ok(vipService.list());
+    }
+    
+    
+    
+    @RequiresPermissions(value = {"/vipSetting/list", "/vipOrder"}, logical = Logical.OR)
     @ApiOperation(tags = {"管理后台-会员管理"},value = "会员列表分页查询")
     @PostMapping(value = "/pageList")
     public AjaxResult<PageInfo<TVip>> pageList(@RequestBody BasePage basePage) {
         return AjaxResult.ok(vipService.pageList(basePage.getPageCurr(), basePage.getPageSize()));
     }
-
+    
+    
+    
+    @RequiresPermissions(value = {"/appUser/list", "/appUser/giftVip", "/appUser/gift_vip", "/vipList"}, logical = Logical.OR)
     @ApiOperation(tags = {"会员下拉框"},value = "会员列表分页查询")
     @GetMapping(value = "/select")
     public AjaxResult<List<TVip>> select() {
@@ -151,8 +185,8 @@
                         .last("LIMIT 1")));
         }
     }
-
-
+    
+    
     @ApiOperation(value = "会员信息", tags = {"小程序-个人中心"})
     @GetMapping("/vipInfo")
     public R<List<VipInfoDto>> vipInfo() {
@@ -216,41 +250,148 @@
     }
 
 
+    @Resource
+    private AppUserClient appUserClient;
+
+    @Resource
+    private AppUserVipDetailClient vipDetailClient;
+    
+    
+    @ApiOperation(value = "当前生效会员信息", tags = {"小程序-个人中心"})
+    @GetMapping("/recent/vipInfo")
+    public R<List<VipInfoDto>> recentVipInfo() {
+       Long userId = tokenService.getLoginUserApplet().getUserId();
+       TAppUser data = appUserClient.getUserById(userId).getData();
+       if (data.getVipEndTime()!=null&&data.getVipEndTime().isAfter(LocalDateTime.now())) {
+
+           List<VipInfoDto> vipInfoDtos = new ArrayList<>();
+
+//           List<TVip> vips = vipService.lambdaQuery().eq(TVip::getId, data.getVipId()).list();
+           List<TVip> vips = new ArrayList<>();
+           GetAppUserVipDetail getAppUserVipDetail = new GetAppUserVipDetail();
+           getAppUserVipDetail.setAppUserId(userId);
+           getAppUserVipDetail.setVipId(data.getVipId());
+           R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
+           TAppUserVipDetail data1 = appUserVipDetail.getData();
+           String vipJson = data1.getVipJson();
+           TVip tVip = JSON.parseObject(vipJson, TVip.class);
+           vips.add(tVip);
+           LocalDateTime now = LocalDateTime.now();
+           for (TVip vip : vips) {
+               VipInfoDto vipInfoDto = new VipInfoDto();
+               vipInfoDto.setMonthlyCard(vip.getMonthlyCardReveal() == 1 ? vip.getMonthlyCard() : null);
+               vipInfoDto.setSeasonCard(vip.getSeasonCardReveal() == 1 ? vip.getSeasonCard() : null);
+               vipInfoDto.setAnnualCard(vip.getAnnualCardReveal() == 1 ? vip.getAnnualCard() : null);
+               //判断是否在折扣时间内,然后设置折扣价格
+               if (vip.getMonthlyCardDiscountStart() != null && (now.isAfter(vip.getMonthlyCardDiscountStart()) && now.isBefore(vip.getMonthlyCardDiscountEnd()))) {
+                   vipInfoDto.setMonthlyCardDiscount(vip.getMonthlyCardDiscount());
+               }
+               if (vip.getSeasonCardDiscountStart() != null && (now.isAfter(vip.getSeasonCardDiscountStart()) && now.isBefore(vip.getSeasonCardDiscountEnd()))) {
+                   vipInfoDto.setSeasonCardDiscount(vip.getSeasonCardDiscount());
+               }
+               if (vip.getAnnualCardDiscountStart() != null && (now.isAfter(vip.getAnnualCardDiscountStart()) && now.isBefore(vip.getAnnualCardDiscountEnd()))) {
+                   vipInfoDto.setAnnualCardDiscount(vip.getAnnualCardDiscount());
+               }
 
 
+               vipInfoDto.setMaximumDeduction(vip.getMaximumDeduction());
+               vipInfoDto.setDiscountTimes(vip.getDiscountTimes());
+               vipInfoDto.setDoubleIntegration(vip.getDoubleIntegration());
+               vipInfoDto.setMallExclusivePrice(vip.getMallExclusivePrice());
+               vipInfoDto.setName(vip.getName());
+               vipInfoDto.setId(vip.getId());
+               if (vip.getCoupon()!=null) {
+                   List<SendCouponDto> javaList = JSON.parseArray(vip.getCoupon()).toJavaList(SendCouponDto.class);
+                   List<VipCouponDto> vipCouponDtos = new ArrayList<>();
+                   if (!javaList.isEmpty()) {
+                       for (SendCouponDto sendCouponDto : javaList) {
+                           VipCouponDto vipCouponDto = new VipCouponDto();
+                           TCoupon byId = couponService.getById(sendCouponDto.getId());
+                           vipCouponDto.setNum(sendCouponDto.getNumber());
+                           vipCouponDto.setTCoupon(byId);
+                           vipCouponDtos.add(vipCouponDto);
+                       }
+                   }
+
+                   vipInfoDto.setVipCouponDtos(vipCouponDtos);
+
+               //计算总折扣
+               BigDecimal total = BigDecimal.ZERO;
+               total = total.add(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
+               for (VipCouponDto vipCouponDto : vipCouponDtos) {
+                   TCoupon tCoupon = vipCouponDto.getTCoupon();
+                   if (tCoupon.getPreferentialMode() == 2) {
+                       total.add(tCoupon.getMaximumDiscountAmount());
+                   } else {
+                       total.add(tCoupon.getDiscountAmount());
+                   }
+               }
+
+               vipInfoDto.setTotalDiscount(total);
+
+               vipInfoDto.setTimeAmount(vip.getMaximumDeduction().multiply(BigDecimal.valueOf(vip.getDiscountTimes())));
+               }
+               vipInfoDto.setType(vip.getType());
+               vipInfoDtos.add(vipInfoDto);
+
+           }
+           return R.ok(vipInfoDtos);
+
+       }
+       return R.ok();
+    }
+    
+    
+    
+    @Log(title = "【会员】购买会员", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
     @ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
     @GetMapping("/vipInfo/pay")
-    public R vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
-        @RequestParam("payType") Integer payType
-    ) {
-
+    public Object vipInfoPay(@RequestParam("vipId")Integer vipId,@RequestParam("buyType") Integer buyType,
+        @RequestParam("payType") Integer payType) {
+    
+        LocalDateTime now = LocalDateTime.now();
         TVip byId = vipService.getById(vipId);
+        if (byId==null){
+            return R.ok("当前会员不存在,请刷新后重试。");
+        }
+        if(byId.getReveal() == 0){
+            return R.ok("无效的会员");
+        }
+        if(1 == buyType && byId.getMonthlyCardReveal() == 0){
+            return R.ok("无效的会员");
+        }
+        if(2 == buyType && byId.getSeasonCardReveal() == 0){
+            return R.ok("无效的会员");
+        }
+        if(3 == buyType && byId.getAnnualCardReveal() == 0){
+            return R.ok("无效的会员");
+        }
+        
         BigDecimal payMoney = BigDecimal.ZERO;
         BigDecimal discountMoney = BigDecimal.ZERO;
         BigDecimal discount = BigDecimal.ZERO;
-        LocalDateTime now = LocalDateTime.now();
         switch (buyType){
             case 1:
                 if (byId.getMonthlyCardDiscountStart()!=null&&(now.isAfter(byId.getMonthlyCardDiscountStart())&&now.isBefore(byId.getMonthlyCardDiscountEnd()))){
-                    payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount());
+                    payMoney = byId.getMonthlyCard().multiply(byId.getMonthlyCardDiscount().divide(new BigDecimal(10)));
                     discountMoney = byId.getMonthlyCard().subtract(payMoney);
                     discount = byId.getMonthlyCardDiscount();
                 }else {
                     payMoney = byId.getMonthlyCard();
                 }
                 break;
-                case 2:
-                    if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
-                        payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount());
-                        discountMoney = byId.getSeasonCard().subtract(payMoney);
-                        discount = byId.getSeasonCardDiscount();
-                    }else {
-                        payMoney = byId.getSeasonCard();
-                    }
+            case 2:
+                if (byId.getSeasonCardDiscountStart()!=null&&(now.isAfter(byId.getSeasonCardDiscountStart())&&now.isBefore(byId.getSeasonCardDiscountEnd()))){
+                    payMoney = byId.getSeasonCard().multiply(byId.getSeasonCardDiscount().divide(new BigDecimal(10)));
+                    discountMoney = byId.getSeasonCard().subtract(payMoney);
+                    discount = byId.getSeasonCardDiscount();
+                }else {
+                    payMoney = byId.getSeasonCard();
+                }
                 break;
             case 3:
                 if (byId.getAnnualCardDiscountStart()!=null&&(now.isAfter(byId.getAnnualCardDiscountStart())&&now.isBefore(byId.getAnnualCardDiscountEnd()))){
-                    payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount());
+                    payMoney = byId.getAnnualCard().multiply(byId.getAnnualCardDiscount().divide(new BigDecimal(10)));
                     discountMoney = byId.getAnnualCard().subtract(payMoney);
                     discount = byId.getAnnualCardDiscount();
                 }else {
@@ -261,8 +402,7 @@
 
         Long userId = tokenService.getLoginUserApplet().getUserId();
 
-        return R.ok(vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId));
+        return vipService.vipInfoPay(byId,payMoney,payType,discountMoney,discount,buyType,userId);
     }
-
 }
 

--
Gitblit v1.7.1