直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功

KKSU

2023-12-28 752bf0d8b37b3b17212836fa7cb2a93c15aab4be

直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功

 src/main/java/cc/mrbird/febs/mall/controller/AdminCommonController.java

@@ -26,4 +26,9 @@
    public FebsResponse findDicByType(@PathVariable("type") String type) {
        return new FebsResponse().success().data(commonService.findDataDicByType(type));
    }

    @GetMapping(value = "/findMemberDicByType")
    public FebsResponse findMemberDicByType() {
        return new FebsResponse().success().data(commonService.findMemberDicByType());
    }
}

 src/main/java/cc/mrbird/febs/mall/service/ICommonService.java

@@ -28,4 +28,6 @@
    void updateDataDic(String type, String code, String value);

    void changeWallet(Long orderId, int payType);

    List<DataDictionaryCustom> findMemberDicByType();
}

 src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java

@@ -1,9 +1,6 @@
package cc.mrbird.febs.mall.service.impl;

import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
@@ -26,6 +23,7 @@
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@@ -309,4 +307,19 @@
            mallAchieveRecordMapper.insert(mallAchieveRecord);
        }
    }

    @Override
    public List<DataDictionaryCustom> findMemberDicByType() {
        List<DataDictionaryCustom> dataDictionaryCustoms = new ArrayList<>();
        List<String> levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType();
        if(CollUtil.isNotEmpty(levelType)){
            for(String level : levelType){
                DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        level, level
                );
                dataDictionaryCustoms.add(dataDictionaryCustom);
            }
        }
        return dataDictionaryCustoms;
    }
}

 src/main/resources/templates/febs/views/modules/system/profitSetting.html

@@ -46,27 +46,26 @@
            elem: '#agentBonus'
            ,cols: [[ //表头
                {field: 'description', title: '名称'}
                ,{field: 'prop', title: '补贴比例(%)', edit:'text'}
                ,{field: 'achieve', title: '团队贡献值', edit:'text'}
                ,{field: 'direct', title: '直推(个)', edit:'text'}
                ,{field: 'lastAgentCnt', title: '上一级代理(个)', edit:'text'}
                ,{field: 'directCnt', title: '直推(个)', edit:'text'}
                ,{field: 'PerkPercent', title: '团队补贴', edit:'text'}
                ,{field: 'equalsPerkPercent', title: '平级补贴', edit:'text'}
                ,{field: 'type', title: '比例', edit:'text', hide:'true'}
                ,{field: 'code', title: '比例', edit:'text', hide:'true'}
            ]]
            ,data: []
        });
        table.on('edit(agentBonus)', function(obj){
            var value = obj.value //得到修改后的值
            let value = obj.value //得到修改后的值
                ,data = obj.data //得到所在行所有键值
                ,field = obj.field; //得到字段

            for (let i = 0; i < agentBonusArr.length; i++) {
                if (agentBonusArr[i].code === data.code) {
                    var valueData = {};
                    valueData.teamIncome = data.achieve;
                    valueData.profitProp = data.prop;
                    valueData.directCnt = data.direct;
                    valueData.lastAgentCnt = data.lastAgentCnt;
                    let valueData = {};
                    valueData.directCnt = data.directCnt;
                    valueData.PerkPercent = data.PerkPercent;
                    valueData.equalsPerkPercent = data.equalsPerkPercent;
                    valueData.description = data.description;
                    agentBonusArr[i].value = JSON.stringify(valueData);
                }
            }
@@ -74,21 +73,19 @@

        dicDataReq("AGENT_LEVEL_REQUIRE");
        function dicDataReq(type) {
            $.get(ctx + 'admin/common/findDicByType/' + type, function (r) {
            $.get(ctx + 'admin/common/findMemberDicByType', function (r) {
                if (r.code === 200) {
                    var data = r.data;
                    if ("AGENT_LEVEL_REQUIRE" == type) {
                        for (let i = 0; i < data.length; i++) {
                            data[i].prop = JSON.parse(data[i].value).profitProp;
                            data[i].achieve = JSON.parse(data[i].value).teamIncome;
                            data[i].direct = JSON.parse(data[i].value).directCnt;
                            data[i].lastAgentCnt = JSON.parse(data[i].value).lastAgentCnt;
                        }
                        agentBonusArr = data;
                        table.reload('agentBonus', {
                            data : data
                        });
                    let data = r.data;
                    for (let i = 0; i < data.length; i++) {
                        data[i].directCnt = JSON.parse(data[i].value).directCnt;
                        data[i].PerkPercent = JSON.parse(data[i].value).PerkPercent;
                        data[i].equalsPerkPercent = JSON.parse(data[i].value).equalsPerkPercent;
                        data[i].description = data[i].description;
                    }
                    agentBonusArr = data;
                    table.reload('agentBonus', {
                        data : data
                    });
                }
            });
        }