Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-08 52d18b0c747f12c64c9f9b36acb1b5e25f131e0c

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

@@ -5,6 +5,8 @@
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.model.TAppUser;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
@@ -217,6 +219,77 @@
    }


    @Resource
    private AppUserClient appUserClient;

    @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();
           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());
               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())));
               vipInfoDtos.add(vipInfoDto);
           }
           return R.ok(vipInfoDtos);

       }
       return R.ok();
    }



    @ApiOperation(value = "购买会员", tags = {"小程序-个人中心"})
@@ -226,6 +299,9 @@
    ) {

        TVip byId = vipService.getById(vipId);
        if (byId==null){
            return R.ok("当前会员不存在，请刷新后重试。");
        }
        BigDecimal payMoney = BigDecimal.ZERO;
        BigDecimal discountMoney = BigDecimal.ZERO;
        BigDecimal discount = BigDecimal.ZERO;