puzhibing
2024-12-09 03087dc9b9a1e3a74bf74ba06446e72a44b96e07
Merge remote-tracking branch 'origin/master'
3个文件已修改
24 ■■■■■ 已修改文件
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianSubscribeVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
@@ -33,6 +33,26 @@
    @Override
    public Boolean checkReadyToBeProxy(Long userId,Integer vipId) {
        AppUser appUser = appUserService.getById(userId);
        // 消费积分
        Integer shopPoint = appUser.getShopPoint();
        // 返佣积分
        Integer sharePoint = appUser.getSharePoint();
        // 准代理会员设置
        VipSetting vipSetting = vipSettingService.getVipSettingById(4);
        // 消费积分阈值
        Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
        // 返佣积分阈值
        Integer vipLevelUpShare = vipSetting.getVipLevelUpShare();
        if (shopPoint >=vipLevelUpShop && sharePoint >= vipLevelUpShare){
            return true;
        }
        // 直推钻石用户数阈值
        Integer vipDirectNum = vipSetting.getVipDirectNum();
        // 获取用户直推钻石用户数量
        long userDiamondsCount = appUserService.count(new LambdaQueryWrapper<AppUser>()
                .eq(AppUser::getInviteUserId, userId)
                .eq(AppUser::getVipId, 3));
        return false;
    }
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/TechnicianSubscribeVO.java
@@ -60,4 +60,6 @@
    @ApiModelProperty(value = "纬度")
    private String latitude;
}
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
@@ -26,7 +26,7 @@
    <select id="getTechnicianSubscribeByUser" resultType="com.ruoyi.other.vo.TechnicianSubscribeVO">
        SELECT  * from (
        SELECT
            tts.id,
            CAST(tts.id AS CHAR) id,
            tts.user_address,
            ts.`name` shopName,
            ts.address shopAddress,