房间周流水-后台-levelName

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomWeekDiamondRewardRecordAdminVo.java

@@ -40,6 +40,9 @@ public class RoomWeekDiamondRewardRecordAdminVo {
     @ExcelProperty("对应流水发放金币")
     @ApiModelProperty("对应流水发放金币")
     private BigDecimal rewardGold;
+    @ExcelProperty("等级名称")
+    @ApiModelProperty("等级名称")
+    private String levelName;
     @ExcelProperty("发放状态：0:未发放，1已经发放")
     @ApiModelProperty("发放状态：0:未发放，1已经发放")
     private Byte status;

accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml

@@ -17,6 +17,7 @@
             reward.reward_gold rewardGold,
             au.username operator,
             pi.`desc` partitionIdDesc,
+            rwr.level_name levelName,
         if(reward.id is null, 0, 1) `status`,
         reward.create_time createTime
         FROM
@@ -25,6 +26,9 @@
             ON rn.room_uid = reward.room_uid
             and rn.stat_date = reward.stat_date
             and rn.partition_id = reward.partition_id
+        LEFT JOIN room_week_diamond_reward rwr 
+            ON rn.partition_id = rwr.partition_id 
+            AND rn.diamond_num >= rwr.diamond_num
         left join guild_member gm on gm.uid = rn.room_uid and gm.`enable` = 1
         left join guild g on g.id = gm.guild_id and g.`enable` = 1
         left join users owner on owner.uid = g.owner_uid
@@ -62,6 +66,8 @@
             </if>
             and rn.stat_date != #{notEqualsTodate}
         </where>
+        GROUP BY rn.id, reward.id, rwr.id
         order by rn.stat_date desc, rn.diamond_num desc, `status` asc
     </select>
+
 </mapper>

accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/model/room/RoomWeekDiamondReward.java

@@ -29,6 +29,10 @@ public class RoomWeekDiamondReward implements Serializable {
      * 金币奖励
      */
     private BigDecimal rewardGold;
+    /**
+     * 等级名称
+     */
+    private String levelName;
     /**
      * 创建时间
      */