8.13.1

luodangjia

2024-08-13 098951775cfd01cd1afc390d279627e1a21e3527

8.13.1

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/SendCouponDto.java

New file
@@ -0,0 +1,9 @@
package com.ruoyi.account.api.dto;

import lombok.Data;

@Data
public class SendCouponDto {
    private Integer id;
    private Integer number;
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.VipClient;
import org.slf4j.Logger;
@@ -28,6 +29,11 @@
                return R.fail("获取最高抵扣、最低起步价，最高折扣的会员失败:" + throwable.getMessage());

            }

            @Override
            public R<TVip> getInfo(Integer type) {
                return null;
            }
        };
    }
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/VipClient.java

@@ -2,6 +2,7 @@

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.factory.VipFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
@@ -23,5 +24,8 @@
    @PostMapping(value = "/vip/getVipInfoByType")
    R<TVip> getVipInfoByType(@RequestParam Integer type);

    @PostMapping(value = "/vip/getInfo")
    R<TVip> getInfo(@RequestParam Integer id);


}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserVipDetailServiceImpl.java

@@ -1,11 +1,20 @@
package com.ruoyi.account.service.impl;

import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.SendCouponDto;
import com.ruoyi.account.api.model.TAppUserVipDetail;
import com.ruoyi.account.mapper.TAppUserVipDetailMapper;

import com.ruoyi.account.service.TAppUserVipDetailService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.VipClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,14 +26,22 @@
 */
@Service
public class TAppUserVipDetailServiceImpl extends ServiceImpl<TAppUserVipDetailMapper, TAppUserVipDetail> implements TAppUserVipDetailService {
    @Resource
    private VipClient vipClient;

    @Override
    public void giveVipCoupun(Long appUserId, Integer vipId) {
        //给这个用户发放对应vip的优惠卷以及充电次数加满
        //给这个用户发放对应vip的优惠卷以及充电次数加满 ,重置抵扣金额
        R<TVip> info = vipClient.getInfo(vipId);
        TVip data = info.getData();
        String coupon = data.getCoupon();
        if (coupon!=null) {
            List<SendCouponDto> sendList = JSON.parseArray(coupon).toJavaList(SendCouponDto.class);
            for (SendCouponDto sendCouponDto : sendList) {
                
            }





        }
    }
}

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

@@ -56,6 +56,13 @@
    public AjaxResult<TVip> getInfo(Integer id) {
        return AjaxResult.ok(vipService.getById(id));
    }


    @GetMapping("/getById")
    @ApiOperation(value = "通过id查会员")
    public R<TVip> getById(Integer id) {
        return R.ok(vipService.getById(id));
    }
    @ApiOperation(value = "会员列表分页查询")
    @PostMapping(value = "/pageList")
    @ApiImplicitParams({