20210927

xiaoyong931011

2021-09-27 91fdad0b04c69c2c849f25a6bcd8f6d8ca4cdcb8

20210927

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

@@ -178,5 +178,29 @@
        return new FebsResponse().success().data(dataTable);
    }

    /**
     * 奖励设置-列表
     * @param rankAwardDto
     * @param request
     * @return
     */
    @GetMapping("getRankAwardList")
    public FebsResponse getRankAwardList(RankAwardDto rankAwardDto, QueryRequest request) {
        Map<String, Object> data = getDataTable(mallMemberService.getRankAwardList(rankAwardDto, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 奖励设置-更新
     */
    @PostMapping("rankAwardUpdate")
    @ControllerEndpoint(operation = "奖励设置-更新", exceptionMessage = "操作失败")
    public FebsResponse rankAwardUpdate(@Valid RankAwardUpdateDto rankAwardUpdateDto) {
        return mallMemberService.rankAwardUpdate(rankAwardUpdateDto);
    }





}

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

@@ -7,6 +7,7 @@
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.AdminAgentLevelUpdateInfoVo;
import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
import cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -143,6 +144,30 @@
        return FebsUtil.view("modules/mallMember/agentAllMember");
    }

    /**
     * 奖励设置-列表
     * @return
     */
    @GetMapping("rankAwardList")
    @RequiresPermissions("rankAwardList:view")
    public String rankAwardList() {
        return FebsUtil.view("modules/mallMember/rankAwardList");
    }

    /**
     * 奖励设置-详情
     * @param id
     * @param model
     * @return
     */
    @GetMapping("rankAwardUpdate/{id}")
    @RequiresPermissions("rankAwardUpdate:update")
    public String rankAwardUpdate(@PathVariable long id, Model model) {
        AdminRankAwardUpdateInfoVo data = mallMemberService.getRankAwardUpdateInfoById(id);
        model.addAttribute("rankAwardUpdateInfo", data);
        return FebsUtil.view("modules/mallMember/rankAwardUpdate");
    }





 src/main/java/cc/mrbird/febs/mall/dto/RankAwardDto.java

New file
@@ -0,0 +1,9 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "RankAwardDto", description = "参数接口类")
public class RankAwardDto {
}

 src/main/java/cc/mrbird/febs/mall/dto/RankAwardUpdateDto.java

New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.mall.dto;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "RankAwardUpdateDto", description = "参数接口类")
public class RankAwardUpdateDto {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;
}

 src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java

@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallPayMethodEditVo;
import cc.mrbird.febs.mall.vo.AdminPayMethodVo;
import cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,4 +26,6 @@
    DataDictionaryCustom selectDicDataByTypeAndCode(@Param("type") String type, @Param("code") String code);

    List<AdminAgentLevelOptionTreeVo> getAgentLevelOption();

    AdminRankAwardUpdateInfoVo getRankAwardUpdateInfoById(@Param("id")long id);
}

 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java

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

import cc.mrbird.febs.mall.dto.AgentDto;
import cc.mrbird.febs.mall.dto.AgentLevelDto;
import cc.mrbird.febs.mall.dto.RankAwardDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -53,4 +54,8 @@
    IPage<AdminAgentLevelVo> getAgentLevelListInPage(Page<AdminAgentLevelVo> page, @Param("record")AgentLevelDto agentLevelDto);

    IPage<AdminAgentMemberVo> getAgentChildInPage(Page<AdminAgentMemberVo> page, @Param("record")MallMember mallMember);

    IPage<AdminRankAwardVo> getRankAwardListInPage(Page<AdminRankAwardVo> page, RankAwardDto rankAwardDto);

    BigDecimal getAgentTeamAmountByInviteId(@Param("inviteId")String inviteId);
}

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

@@ -44,4 +44,10 @@
    List<AdminAgentLevelOptionTreeVo> getAgentLevelOption();

    IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember);

    IPage<AdminRankAwardVo> getRankAwardList(RankAwardDto rankAwardDto, QueryRequest request);

    AdminRankAwardUpdateInfoVo getRankAwardUpdateInfoById(long id);

    FebsResponse rankAwardUpdate(RankAwardUpdateDto rankAwardUpdateDto);
}

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

@@ -219,7 +219,37 @@
        mallMember = mallMemberMapper.selectById(memberId);
        Page<AdminAgentMemberVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminAgentMemberVo> adminAgentMemberVos = this.baseMapper.getAgentChildInPage(page, mallMember);
        List<AdminAgentMemberVo> records = adminAgentMemberVos.getRecords();
        if(CollUtil.isNotEmpty(records)){
            for(AdminAgentMemberVo agentMemberVo : records){
                String inviteId = agentMemberVo.getInviteId();
                BigDecimal amount = mallMemberMapper.getAgentTeamAmountByInviteId(inviteId);
                agentMemberVo.setAmount(amount);
            }
        }
        return adminAgentMemberVos;
    }

    @Override
    public IPage<AdminRankAwardVo> getRankAwardList(RankAwardDto rankAwardDto, QueryRequest request) {
        Page<AdminRankAwardVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminRankAwardVo> adminRankAwardVos = this.baseMapper.getRankAwardListInPage(page, rankAwardDto);
        return adminRankAwardVos;
    }

    @Override
    public AdminRankAwardUpdateInfoVo getRankAwardUpdateInfoById(long id) {
        AdminRankAwardUpdateInfoVo adminRankAwardUpdateInfoVo = dataDictionaryCustomMapper.getRankAwardUpdateInfoById(id);
        return adminRankAwardUpdateInfoVo;
    }

    @Override
    public FebsResponse rankAwardUpdate(RankAwardUpdateDto rankAwardUpdateDto) {
        DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(rankAwardUpdateDto.getId());
        dataDictionaryCustom.setValue(rankAwardUpdateDto.getValue());
        dataDictionaryCustom.setDescription(rankAwardUpdateDto.getDescription());
        dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
        return new FebsResponse().success();
    }

}

 src/main/java/cc/mrbird/febs/mall/vo/AdminAgentMemberVo.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value = "AdminAgentMemberVo", description = "信息返回类")
public class AdminAgentMemberVo {
@@ -26,4 +28,6 @@
     * 父级邀请码
     */
    private String referrerId;

    private BigDecimal amount;
}

 src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java

@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.math.BigDecimal;

@Data
@ApiModel(value = "AdminAgentVo", description = "信息返回类")
public class AdminAgentVo {
@@ -17,6 +19,8 @@

    private String levelName;

    private BigDecimal amount;

    /**
     * 邀请码
     */

 src/main/java/cc/mrbird/febs/mall/vo/AdminRankAwardUpdateInfoVo.java

New file
@@ -0,0 +1,20 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminRankAwardUpdateInfoVo", description = "信息返回类")
public class AdminRankAwardUpdateInfoVo {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;

}

 src/main/java/cc/mrbird/febs/mall/vo/AdminRankAwardVo.java

New file
@@ -0,0 +1,19 @@
package cc.mrbird.febs.mall.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminRankAwardVo", description = "信息返回类")
public class AdminRankAwardVo {

    private Long id;

    private String type;

    private String code;

    private String value;

    private String description;
}

 src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml

@@ -34,4 +34,9 @@
        select a.code id,a.description name from data_dictionary_custom a
        where a.type='AGENT_LEVEL'
    </select>

    <select id="getRankAwardUpdateInfoById" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo">
        select a.* from data_dictionary_custom a
        where a.id =  #{id}
    </select>
</mapper>

 src/main/resources/mapper/modules/MallMemberMapper.xml

@@ -115,7 +115,21 @@
    </select>

    <select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
        SELECT m.*,a.description levelName FROM mall_member m

        SELECT m.*,a.description levelName,
        ifnull((
        SELECT
        sum(b.amount)
        FROM
        mall_member e
        INNER JOIN mall_order_info b ON e.id = b.member_id
        AND b. STATUS = 4
        WHERE
        e.invite_id = m.invite_id
        OR e.referrer_id = m.invite_id
        or find_in_set(m.invite_id, e.referrer_ids)
        ),0) amount
        FROM mall_member m
        left join data_dictionary_custom a on a.code = m.level
        <where>
            <if test="record != null" >
@@ -167,5 +181,26 @@
        select m.*,a.description levelName from mall_member m
            left join data_dictionary_custom a on a.code = m.level
        where  find_in_set(#{record.inviteId}, m.referrer_ids)
        GROUP BY m.id
        ORDER BY
            m.CREATED_TIME DESC
    </select>

    <select id="getRankAwardListInPage" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardVo">
        select a.* from data_dictionary_custom a where a.type = 'RANK_AWARD' or a.type = 'RANK_AWARD_SETTING'
    </select>


    <select id="getAgentTeamAmountByInviteId" resultType="java.math.BigDecimal">
            SELECT
                ifnull(sum(b.amount),0)
            FROM
                mall_member e
                    INNER JOIN mall_order_info b ON e.id = b.member_id
                    AND b. STATUS = 4
            WHERE
                e.invite_id = #{inviteId}
               OR e.referrer_id = #{inviteId}
               or find_in_set(#{inviteId}, e.referrer_ids)
    </select>
</mapper>

 src/main/resources/templates/febs/views/modules/mallMember/agentAllMember.html

@@ -47,6 +47,7 @@
                    {field: 'phone', title: '电话', minWidth: 150,align:'center'},
                    {field: 'inviteId', title: '邀请码', minWidth: 150,align:'center'},
                    {field: 'levelName', title: '等级', minWidth: 150,align:'center'},
                    {field: 'amount', title: '团队业绩', minWidth: 150,align:'center'},
                ]]
            });
        }

 src/main/resources/templates/febs/views/modules/mallMember/agentLevelUpdate.html

@@ -96,7 +96,6 @@
        initUserValue();

        function initUserValue() {
            $('#imageUrls').attr('src', agentLevelUpdateInfo.value);
            form.val("agent-level-edit-form", {
                "id": agentLevelUpdateInfo.id,
                "orderType": agentLevelUpdateInfo.orderType,

 src/main/resources/templates/febs/views/modules/mallMember/agentList.html

@@ -113,6 +113,7 @@
                    {field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
                    {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
                    {field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left'},
                    {field: 'amount', title: '团队业绩', minWidth: 100,align:'left'},
                    {title: '操作',
                        templet: function (d) {
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentAllMember" shiro:hasPermission="user:update">全部成员</button>'

 src/main/resources/templates/febs/views/modules/mallMember/rankAwardList.html

New file
@@ -0,0 +1,115 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-user-rankaward" lay-title="奖励设置">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md10">
                                <div class="layui-form-item">
                                </div>
                            </div>
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="userRankAwardTable" lay-data="{id: 'userRankAwardTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="user:view,user:update,user:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
    </span>
    <a lay-event="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-user-rankaward'),
            $query = $view.find('#query'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(userRankAwardTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'rankAwardUpdate') {
                febs.modal.open('编辑', 'modules/mallMember/rankAwardUpdate/' + data.id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#rankAwardUpdate-edit').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
        });

        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'userRankAwardTable',
                url: ctx + 'admin/mallMember/getRankAwardList',
                cols: [[
                    {field: 'description', title: '名称', minWidth: 100,align:'left'},
                    {field: 'value', title: '值', minWidth: 100,align:'left'},
                    {title: '操作',
                        templet: function (d) {
                        // if(d.type === 'RANK_AWARD'){
                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="rankAwardUpdate" shiro:hasPermission="user:update">编辑</button>'
                        // }else if(d.type === 'RANK_AWARD_SETTING'){
                        //     return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="rankSet" shiro:hasPermission="user:update">编辑</button>'
                        // }else{
                        //     return ''
                        // }

                        },minWidth: 300,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {};
        }

    })
</script>

 src/main/resources/templates/febs/views/modules/mallMember/rankAwardUpdate.html

New file
@@ -0,0 +1,83 @@
<style>
    #rankAwardUpdate-edit {
        padding: 20px 25px 25px 0;
    }

    #rankAwardUpdate-edit .layui-treeSelect .ztree li a, .ztree li span {
        margin: 0 0 2px 3px !important;
    }
    #rankAwardUpdate-edit #data-permission-tree-block {
        border: 1px solid #eee;
        border-radius: 2px;
        padding: 3px 0;
    }
    #rankAwardUpdate-edit .layui-treeSelect .ztree li span.button.switch {
        top: 1px;
        left: 3px;
    }
    #rankAwardUpdate-edit img{
        max-width:200px
    }

</style>
<div class="layui-fluid" id="rankAwardUpdate-edit">
    <form class="layui-form" action="" lay-filter="rankAwardUpdate-edit-form">
        <div class="layui-form-item febs-hide">
            <label class="layui-form-label">id：</label>
            <div class="layui-input-block">
                <input type="text" name="id">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">名称：</label>
            <div class="layui-input-block">
                <input type="text" name="description" lay-verify="required" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">值：</label>
            <div class="layui-input-block">
                <input type="number" name="value" lay-verify="required" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item febs-hide">
            <button class="layui-btn" lay-submit="" lay-filter="rankAwardUpdate-edit-submit" id="submit"></button>
        </div>
    </form>
</div>

<script data-th-inline="javascript">
    layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree'], function () {
        var $ = layui.$,
            febs = layui.febs,
            layer = layui.layer,
            formSelects = layui.formSelects,
            treeSelect = layui.treeSelect,
            form = layui.form,
            eleTree = layui.eleTree,
            rankAwardUpdateInfo = [[${rankAwardUpdateInfo}]],
            $view = $('#rankAwardUpdate-edit'),
            validate = layui.validate,
            _deptTree;
        form.render();

        initUserValue();

        function initUserValue() {
            form.val("rankAwardUpdate-edit-form", {
                "id": rankAwardUpdateInfo.id,
                "value": rankAwardUpdateInfo.value,
                "description": rankAwardUpdateInfo.description
            });
        }

        form.on('submit(rankAwardUpdate-edit-submit)', function (data) {
            febs.post(ctx + 'admin/mallMember/rankAwardUpdate', data.field, function () {
                layer.closeAll();
                febs.alert.success('操作成功');
                $('#febs-user-rankaward').find('#reset').click();
            });
            return false;
        });
    });
</script>