From 82a3a1c9d1c269bb6a09a406dc3da555a98fcdcb Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sat, 27 Jan 2024 21:25:25 +0800 Subject: [PATCH] init --- .../controller/app/InviteAppController.java | 1 + .../com/ruoyi/cai/enums/SystemConfigEnum.java | 3 +- .../ruoyi/cai/notice/YunxinHttpService.java | 31 ++++++++++--------- .../service/impl/UserInviteServiceImpl.java | 23 +++++++++++--- .../java/com/ruoyi/cai/util/CaiNumUtil.java | 2 +- .../java/com/ruoyi/cai/util/RateUtil.java | 12 +++++++ 6 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/util/RateUtil.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java index 2d10527a..8aa25479 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/InviteAppController.java @@ -3,6 +3,7 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.service.UserInviteService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.PageQuery; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java index f31f9f68..2359fb66 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java @@ -17,6 +17,7 @@ public enum SystemConfigEnum { RANK_INVITE_DAY_AWARD("138,108,88,58,38,28,28,28,28,28,28", "邀请榜日榜奖励",SystemConfigGroupEnum.BUSINESS,new RankSystemConfigCheck()), RANK_INVITE_WEEK_AWARD("888,588,388,288,188,138,138,138,138,138,138,138", "邀请榜周榜奖励",SystemConfigGroupEnum.BUSINESS,new RankSystemConfigCheck()), INVITE_BIND_RATE("1000", "邀请绑定成功率[0-1000]数字越大成功率越高",SystemConfigGroupEnum.BUSINESS, new Rate1000IntegerSystemConfigCheck()), + SHARE_URL("https://h5.qx96688.com/index/invite/index", "分享链接",SystemConfigGroupEnum.BUSINESS, new Rate1000IntegerSystemConfigCheck()), // INVITE_GIFT_RATE("100", "礼物分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), // INVITE_GUARD_RATE("100", "守护分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), // INVITE_VIDEO_RATE("100", "视频分销成功率",SystemConfigGroupEnum.BUSINESS, new RateIntegerSystemConfigCheck()), @@ -33,7 +34,7 @@ public enum SystemConfigEnum { DEFAULT_VIDEO_INCOME_RATE("0.07", "默认分销好友视频提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), DEFAULT_GIFT_INCOME_RATE("0.07", "默认分销好友礼物提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), DEFAULT_GUARD_INCOME_RATE("0.07", "默认分销好友守护提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), - DEFAULT_PAY_INCOME_RATE("0.07", "默认分销好友充值提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), + DEFAULT_PAY_INCOME_RATE("0.3", "默认分销好友充值提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()), @Deprecated DEFAULT_UNION_GIFT_INCOME_RATE("0.01", "默认工会礼物提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), DEFAULT_UNION_VIDEO_INCOME_RATE("0.01", "默认工会视频提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()), diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java index edcd3e19..623a6156 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java @@ -1,6 +1,7 @@ package com.ruoyi.cai.notice; import com.alibaba.fastjson.JSON; +import com.ruoyi.cai.config.CaiProperties; import com.ruoyi.cai.domain.Gift; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.mq.handle.dto.WindowRechargeDTO; @@ -40,6 +41,8 @@ public class YunxinHttpService { @Autowired private AccountService accountService; @Autowired + private CaiProperties caiProperties; + @Autowired private UserService userService; /** @@ -52,8 +55,8 @@ public class YunxinHttpService { data.setTitle("系统奖励"); data.setCurrentDate(); data.setTxt1("陌生人交友需谨慎，添加陌生人微信,QQ失去平台监管有极大被骗风险，凡是诱导加微信，QQ引导到其他平台或以色情为由索取礼物的行为，请大家及时举报，一经查明直接永久封号，良好的交友氛围需大家共同维护，希望大家提高自我警惕性杜绝被骗"); - data.addFields("注册奖励",rewardCoin+"云贝"); - data.addFields("总云贝",totalCoin+"云贝"); + data.addFields("注册奖励",rewardCoin+caiProperties.getCoinName()); + data.addFields("总"+caiProperties.getCoinName(),totalCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ @@ -71,8 +74,8 @@ public class YunxinHttpService { data.setAction(1); data.setTitle("购买成功"); data.setCurrentDate(); - data.addFields("购买云贝",rewardCoin+"云贝"); - data.addFields("总云贝",totalCoin+"云贝"); + data.addFields("购买"+caiProperties.getCoinName(),rewardCoin+caiProperties.getCoinName()); + data.addFields("总"+caiProperties.getCoinName(),totalCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ @@ -95,9 +98,9 @@ public class YunxinHttpService { data.setTitle("收到礼物"); data.setCurrentDate(); data.addFields("礼物名称",gift.getName()); - data.addFields("礼物单价",gift.getPrice()+"云贝"); - data.addFields("收入云贝",incomeCoin+"云贝"); - data.addFields("总云贝",totalCoin+"云贝"); + data.addFields("礼物单价",gift.getPrice()+caiProperties.getCoinName()); + data.addFields("收入"+caiProperties.getCoinName(),incomeCoin+caiProperties.getCoinName()); + data.addFields("总"+caiProperties.getCoinName(),totalCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ @@ -124,7 +127,7 @@ public class YunxinHttpService { data.setCurrentDate(); data.addFields("用户昵称",sourceNickname); data.addFields("用户蜜瓜号",sourceUsercode); - data.addFields(str,incomeCoin+"云贝"); + data.addFields(str,incomeCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ @@ -145,12 +148,12 @@ public class YunxinHttpService { ExtNoticeData data = new ExtNoticeData(); data.setAction(1); data.setTitle("充值分成"); - data.setTxt1(String.format("充值分成：每一笔账户充值将给其邀请账户额外赠送%s的云贝", CaiNumUtil.rateToStr(rate))); + data.setTxt1(String.format("充值分成：每一笔账户充值将给其邀请账户额外赠送%s的%s", CaiNumUtil.rateToStr(rate), caiProperties.getCoinName())); data.setCurrentDate(); data.addFields("充值用户",sourceUser.getNickname()); data.addFields("蜜瓜号",sourceUser.getUsercode()); - data.addFields("充值金额",payCoin+"云贝"); - data.addFields("充值分成",incomeCoin+"云贝"); + data.addFields("充值金额",payCoin+caiProperties.getCoinName()); + data.addFields("充值分成",incomeCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ @@ -341,9 +344,9 @@ public class YunxinHttpService { data.setTitle("收到守护符"); data.setCurrentDate(); data.addFields("守护类型",num+"个守护符"); - data.addFields("守护单价",price+"云贝"); - data.addFields("收入云贝",incomeCoin+"云贝"); - data.addFields("总云贝",totalCoin+"云贝"); + data.addFields("守护单价",price+caiProperties.getCoinName()); + data.addFields("收入"+caiProperties.getCoinName(),incomeCoin+caiProperties.getCoinName()); + data.addFields("总"+caiProperties.getCoinName(),totalCoin+caiProperties.getCoinName()); NoticeR notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data); YxDataR r = yunxin.sendToNotice(toUid, notice); if(r == null || !r.isSuccess()){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java index ca57d150..3ae43ca9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java @@ -9,13 +9,17 @@ import com.ruoyi.cai.dto.admin.vo.UserInviteAdminVo; import com.ruoyi.cai.dto.app.dto.InviteCountDTO; import com.ruoyi.cai.dto.app.vo.invite.InviteHomeVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; +import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.executor.ExecutorConstant; +import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.UserInviteMapper; import com.ruoyi.cai.service.UserInviteService; +import com.ruoyi.cai.util.RateUtil; import com.ruoyi.common.core.domain.PageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -34,21 +38,32 @@ public class UserInviteServiceImpl extends ServiceImpl