版本管理

xiaoyong931011

2023-10-26 58f480d4e4b0e79722a3b6ac20f3b259c410c2d0

版本管理

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

@@ -69,6 +69,8 @@

    BigDecimal selectTotalType(@Param("type")int i,@Param("dateType") String type, @Param("date") Date date);

    BigDecimal selectTotalTypeByUserId(@Param("userId")Long userId,@Param("type")int i,@Param("dateType") String type, @Param("date") Date date);

    List<AdminChatRedBagVo> selectListByMsgType(@Param("userId")Long userId,@Param("msgType")String msgType, @Param("date") Date date);

    List<ChatUser> selectUserList(@Param("isRobot")int i,@Param("dateType") String type, @Param("date") Date date);

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

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

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

@@ -360,6 +360,20 @@
        </if>
    </select>


    <select id="selectTotalTypeByUserId" resultType="java.math.BigDecimal">
        select IFNULL(sum(IFNULL(amount,0)),0)
        from chat_amount_flow
        where type = #{type}
          and user_id = #{userId}
        <if test='dateType == "D"'>
            and date_format(create_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d');
        </if>
        <if test='dateType == "M"'>
            and date_format(create_time, '%Y-%m') = date_format(#{date}, '%Y-%m');
        </if>
    </select>

    <select id="selectUserList" resultType="cc.mrbird.febs.mall.entity.ChatUser">
        select
        a.*