版本管理

xiaoyong931011

2023-10-26 d75d23ea4677b58162356634772630f3ab74dfef

版本管理

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

@@ -60,12 +60,13 @@
                adminChatUserPerkVo.setRedBagTotalAmount(redBagTotalAmount);
                BigDecimal redBagAvaAmount = group.stream().map(AdminChatRedBagVo::getAmountAva).reduce(BigDecimal.ZERO, BigDecimal::add);
                adminChatUserPerkVo.setRedBagAvaAmount(redBagAvaAmount);
                BigDecimal getRedbagAmount = this.baseMapper.selectTotalTypeByUserId(userId,9, null, null);
                BigDecimal getRedbagAmount = this.baseMapper.selectTotalTypeByUserId(userId,12, null, null);
                adminChatUserPerkVo.setGetRedbagAmount(getRedbagAmount);
                BigDecimal boomToAmount = this.baseMapper.selectTotalTypeByUserId(userId,10, null, null);
                adminChatUserPerkVo.setBoomToAmount(boomToAmount);
                BigDecimal teamPerkAmount = this.baseMapper.selectTotalTypeByUserId(userId,7, null, null);
                adminChatUserPerkVo.setTeamPerkAmount(teamPerkAmount);
//                BigDecimal boomFromAmount = this.baseMapper.selectTotalTypeByUserId(userId,9, null, null);
//                BigDecimal teamPerkAmount = this.baseMapper.selectTotalTypeByUserId(userId,7, null, null);
//                adminChatUserPerkVo.setTeamPerkAmount(teamPerkAmount.add(boomFromAmount));
            }
        }
        return chatUserPerkVoIPage;

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

@@ -56,9 +56,15 @@
            FROM chat_red_bag c
            where c.from_user_id = a.user_id
                AND c.msg_type = 'GROUP'
        ) groupRedBagNum
        ) groupRedBagNum,
        (
            select IFNULL(sum(IFNULL(d.amount,0)),0)
            from chat_amount_flow d
            where (d.type = 7 or d.type = 9)
            and d.user_id = a.user_id
        ) teamPerkAmount
        from chat_user a
        left join chat_wallet b on b.user_id = a.user_id and type = 'USDT'
        left join chat_wallet b on b.user_id = a.user_id and b.type = 'USDT'
        <where>
            <if test="record.phone != null and record.phone != ''">
                and a.phone like CONCAT('%', CONCAT(#{record.phone}, '%'))
@@ -74,7 +80,7 @@
            </if>
        </where>
        group by a.user_id
        HAVING groupRedBagNum > 0
        HAVING teamPerkAmount > 0
        order by
        a.user_id asc ,a.create_time asc
    </select>

 src/main/resources/templates/febs/views/modules/chat/userPerkList.html

@@ -150,10 +150,10 @@
                    {field: 'avaAmount', title: '账户余额', minWidth: 80,align:'center',totalRow: '{{= parseInt(d.avaAmount) }}'},
                    {field: 'groupRedBagNum', title: '群红包数', minWidth: 80,align:'center'},
                    {field: 'redBagTotalAmount', title: '发红包总额', minWidth: 100,align:'center'},
                    {field: 'redBagAvaAmount', title: '未领取总额', minWidth: 100,align:'center'},
                    {field: 'getRedbagAmount', title: '领红包金额', minWidth: 100,align:'center'},
                    {field: 'boomToAmount', title: '中雷返回金额', minWidth: 120,align:'center'},
                    {field: 'teamPerkAmount', title: '等级收益金额', minWidth: 120,align:'center'},
                    {field: 'redBagAvaAmount', title: '未被领取总额', minWidth: 120,align:'center'},
                    {field: 'getRedbagAmount', title: '领取红包总额', minWidth: 120,align:'center'},
                    {field: 'boomToAmount', title: '中雷扣除', minWidth: 120,align:'center'},
                    {field: 'teamPerkAmount', title: '中雷补偿团队奖励', minWidth: 160,align:'center'},
                    {field: 'getBoom', title: '中雷', templet: '#switchGetBoom', minWidth: 80,align:'center'},
                    {field: 'createTime', title: '注册时间', minWidth: 160,align:'center'},
                ]]