fix

Hentua

2023-08-31 cbb1c95b0ef07d3d5f6c6cb622caf17549fee0c2

fix

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

@@ -75,20 +75,20 @@
    public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
        Page<MallMember> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MallMember> mallMembers = this.baseMapper.selectMallMemberListInPage(page, mallMember);
        if(CollUtil.isNotEmpty(mallMembers.getRecords())){
            for(MallMember mallMemberTeam : mallMembers.getRecords()){
                Long salesmansId = mallMemberTeam.getSalesmansId();
                MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
                if(ObjectUtil.isNotEmpty(mallSalesman)){
                    StringBuffer salesmanName = new StringBuffer();
                    salesmanName.append(mallSalesman.getName());
                    if(2 == mallSalesman.getState()){
                        salesmanName.append("（禁用）");
                    }
                    mallMemberTeam.setSalesmansName(salesmanName.toString());
                }
            }
        }
//        if(CollUtil.isNotEmpty(mallMembers.getRecords())){
//            for(MallMember mallMemberTeam : mallMembers.getRecords()){
//                Long salesmansId = mallMemberTeam.getSalesmansId();
//                MallSalesman mallSalesman = mallSalesmanMapper.selectById(salesmansId);
//                if(ObjectUtil.isNotEmpty(mallSalesman)){
//                    StringBuffer salesmanName = new StringBuffer();
//                    salesmanName.append(mallSalesman.getName());
//                    if(2 == mallSalesman.getState()){
//                        salesmanName.append("（禁用）");
//                    }
//                    mallMemberTeam.setSalesmansName(salesmanName.toString());
//                }
//            }
//        }
        return mallMembers;
    }


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

@@ -120,6 +120,7 @@
        }
        List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
        MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
        mallGoodsDetailsVo.setMainImage(mallGoods.getThumb());

        List<GoodsDetailsStyleVo> styles = mallGoodsDetailsVo.getStyles();
        if(ObjectUtil.isNotEmpty(styles)){

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

@@ -85,4 +85,6 @@
    private String leaderName;
    //商品名称
    private String goodsName;

    private String refererName;
}

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

@@ -102,4 +102,7 @@

    @ApiModelProperty(value = "是否收藏")
    private Integer hasCollect;

    @ApiModelProperty(value = "商品主图")
    private String mainImage;
}

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

@@ -56,7 +56,8 @@
        select a.*,
               b.name memberName,
               b.bind_phone memberBindPhone,
               b.phone memberPhone
               b.phone memberPhone,
               (select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
        from mall_order_info a
        left join mall_member b on a.member_id = b.id
        <where>

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

@@ -265,9 +265,9 @@
                    // {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
                    // {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
                    // {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
                    // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                    {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
                    // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
                    // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
                    // {field: 'accountType', title: '账号类型',
@@ -296,11 +296,11 @@
                    {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            return  '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
                            return  ''
                                // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
                                // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'

                        },minWidth: 200,align:'center', fixed:"right"}
                        },minWidth: 200,align:'center'}
                ]]
            });
        }

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -411,6 +411,7 @@
                        {field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
                        {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                        {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                        {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
                        {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
                        {field: 'remark', title: '备注', minWidth: 160,align:'left'},
                        {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},