123

ruoyi-cai/src/main/java/com/ruoyi/cai/enums/SystemConfigEnum.java

@@ -38,12 +38,13 @@ public enum SystemConfigEnum {
     DEFAULT_ANCHOR_VIDEO_PRICE("0.5","主播默认视频提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
     DAY_MAX_DYNAMIC("10", "每日运行发布的最大动态数",SystemConfigGroupEnum.BUSINESS,new NumberSystemConfigCheck()),
     IM_ANCHOR_INCOME_RATE("0.5", "聊天主播提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
-    DEFAULT_VIDEO_INCOME_RATE("0.07", "默认分销好友视频提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
+    DEFAULT_VIDEO_INCOME_RATE("0.07", "默认分销上级视频提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
-    DEFAULT_GIFT_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_GUARD_INCOME_RATE("0.07", "默认分销上级守护提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
-    DEFAULT_PAY_INCOME_RATE("0.3", "默认分销好友充值提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
+    DEFAULT_PAY_INCOME_RATE("0.3", "默认分销上级充值提成",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
-    @Deprecated
+    PAY_INCOME_RATE("0", "分销上级充值提成（配置大于0数据后将强制使用该提成）",SystemConfigGroupEnum.BUSINESS,new RateSystemConfigCheck()),
-    DEFAULT_UNION_GIFT_INCOME_RATE("0.01", "默认工会礼物提成",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()),
     DEFAULT_UNION_ONE_INCOME_RATE("0.07", "默认工会一级提成",SystemConfigGroupEnum.BUSINESS, new RateSystemConfigCheck()),
     TODAY_GREET_MAX("100", "每日主播群打招呼次数",SystemConfigGroupEnum.BUSINESS,new NumberSystemConfigCheck()),

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java

@@ -62,6 +62,9 @@ public class SystemConfigManager {
 
     public BigDecimal getSystemConfigOfBigDecimal(SystemConfigEnum systemConfig){
         String value = getSystemConfig(systemConfig);
+        if(StringUtils.isBlank(value)){
+            return new BigDecimal(0);
+        }
         return new BigDecimal(value);
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/ConsumeLogServiceImpl.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cai.domain.*;
 import com.ruoyi.cai.enums.ConsumeLogStatus;
 import com.ruoyi.cai.enums.ConsumeLogType;
+import com.ruoyi.cai.enums.SystemConfigEnum;
 import com.ruoyi.cai.enums.account.AccountChangeCodeEnum;
+import com.ruoyi.cai.manager.SystemConfigManager;
 import com.ruoyi.cai.mapper.ConsumeLogMapper;
 import com.ruoyi.cai.notice.YunxinHttpService;
 import com.ruoyi.cai.rank.RankManager;
@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -46,6 +49,10 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
     private AccountService accountService;
     @Autowired
     private YunxinHttpService yunxinHttpService;
+    @Autowired
+    private SystemConfigManager systemConfigManager;
+    @Autowired
+    private RankManager rankManager;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -127,19 +134,21 @@ public class ConsumeLogServiceImpl extends ServiceImpl<ConsumeLogMapper, Consume
         }
     }
 
-    @Autowired
-    private RankManager rankManager;
-
     @Override
     public ConsumeLog calculateInitFenxiao(ConsumeLog consumeLog){
         if(ConsumeLogType.RECHARGE.getCode().equals(consumeLog.getType())){
             Long sourceUserId = consumeLog.getSourceUserId();
             UserInvite userInvite = userInviteService.getByUserId(sourceUserId);
+            BigDecimal payIncomeRate = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.PAY_INCOME_RATE);
             if(userInvite != null){
                 User oneUser = userService.getById(userInvite.getInviteId());
                 if(oneUser != null && oneUser.getStatus() == 0){
                     UserInfo userInfo = userInfoService.getByUserId(userInvite.getUserId());
-                    consumeLog.setOneRate(userInfo.getPayIncomeRate());
+                    if(payIncomeRate.compareTo(BigDecimal.ZERO) > 0){
+                        consumeLog.setOneRate(payIncomeRate);
+                    }else{
+                        consumeLog.setOneRate(userInfo.getPayIncomeRate());
+                    }
                     consumeLog.setOneUserId(userInvite.getInviteId());
                     consumeLog.setOneUsercode(oneUser.getUsercode());
                     consumeLog.setOnePhone(oneUser.getMobile());