ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改 owner_Id 为 user_Id,和主播业务保持一致

Browse Source
This commit is contained in:
Ziin
2025-07-07 13:24:46 +08:00
parent 3baab6acbd
commit 31a780518a
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java
View File

@@ -104,4 +104,6 @@ public class BigBrotherController {
BeanUtils.toBean(list, BigBrotherRespVO.class)); BeanUtils.toBean(list, BigBrotherRespVO.class));
} }
} }

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java
View File

@@ -49,7 +49,7 @@ public class BigBrotherPageReqVO extends PageParam {
private String hostDisplayId; private String hostDisplayId;
@Schema(description = "该数据所属的账号id", example = "30487") @Schema(description = "该数据所属的账号id", example = "30487")
private String ownerId; private String userId;
/** /**

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java
View File

@@ -62,7 +62,7 @@ public class BigBrotherRespVO {
@Schema(description = "该数据所属的账号id", example = "30487") @Schema(description = "该数据所属的账号id", example = "30487")
@ExcelProperty("该数据所属的账号id") @ExcelProperty("该数据所属的账号id")
private String ownerId; private String userId;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@ExcelProperty("创建时间") @ExcelProperty("创建时间")

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java
View File

@@ -47,6 +47,6 @@ public class BigBrotherSaveReqVO {
private String hostDisplayId; private String hostDisplayId;
@Schema(description = "该数据所属的账号id", example = "30487") @Schema(description = "该数据所属的账号id", example = "30487")
private String ownerId; private String userId;
} }

2
tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java
View File

@@ -74,7 +74,7 @@ public class BigBrotherDO extends BaseDO {
/** /**
* 该数据所属的账号id * 该数据所属的账号id
*/ */
private String ownerId; private String userId;
/** /**
* 该数据所属的租户id * 该数据所属的租户id

14
tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
View File

@@ -24,7 +24,7 @@
<result column="historic_high_coins" jdbcType="INTEGER" property="historicHighCoins" /> <result column="historic_high_coins" jdbcType="INTEGER" property="historicHighCoins" />
<result column="total_gift_coins" jdbcType="INTEGER" property="totalGiftCoins" /> <result column="total_gift_coins" jdbcType="INTEGER" property="totalGiftCoins" />
<result column="host_display_id" jdbcType="VARCHAR" property="hostDisplayId" /> <result column="host_display_id" jdbcType="VARCHAR" property="hostDisplayId" />
<result column="owner_id" jdbcType="VARCHAR" property="ownerId" /> <result column="user_id" jdbcType="VARCHAR" property="userId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="creator" jdbcType="BIGINT" property="creator" /> <result column="creator" jdbcType="BIGINT" property="creator" />
@@ -58,30 +58,30 @@
and sbr.display_id like concat(#{dto.displayId,jdbcType=VARCHAR},'%') and sbr.display_id like concat(#{dto.displayId,jdbcType=VARCHAR},'%')
</if> </if>
<!-- 大哥打赏金币筛选 --> <!-- 大哥打赏金币筛选 -->
<if test="dto.hostcoinsMin != null and dto.hostcoinsMax == null and dto.hostcoinsMax != '' "> <if test="dto.hostcoinsMin != null and dto.hostcoinsMax == null ">
and sbr.hostcoins >=#{dto.hostcoinsMin,jdbcType=INTEGER} and sbr.hostcoins >=#{dto.hostcoinsMin,jdbcType=INTEGER}
</if> </if>
<if test="dto.hostcoinsMax != null and dto.hostcoinsMin == null and dto.hostcoinsMin !='' "> <if test="dto.hostcoinsMax != null and dto.hostcoinsMin == null ">
and sbr.hostcoins &lt;=#{dto.hostcoinsMax,jdbcType=INTEGER} and sbr.hostcoins &lt;=#{dto.hostcoinsMax,jdbcType=INTEGER}
</if> </if>
<if test="dto.hostcoinsMin != null and dto.hostcoinsMax != null " > <if test="dto.hostcoinsMin != null and dto.hostcoinsMax != null " >
and sbr.hostcoins between #{dto.hostcoinsMin,jdbcType=INTEGER} and #{dto.hostcoinsMax,jdbcType=INTEGER} and sbr.hostcoins between #{dto.hostcoinsMin,jdbcType=INTEGER} and #{dto.hostcoinsMax,jdbcType=INTEGER}
</if> </if>
<!-- 大哥打赏总金币筛选 --> <!-- 大哥打赏总金币筛选 -->
<if test="dto.totalGiftCoinsMin != null and dto.totalGiftCoinsMax == null and dto.totalGiftCoinsMax != ''"> <if test="dto.totalGiftCoinsMin != null and dto.totalGiftCoinsMax == null ">
and sbr.total_gift_coins >=#{dto.totalGiftCoinsMin,jdbcType=INTEGER} and sbr.total_gift_coins >=#{dto.totalGiftCoinsMin,jdbcType=INTEGER}
</if> </if>
<if test="dto.totalGiftCoinsMax != null and dto.totalGiftCoinsMin == null and dto.totalGiftCoinsMin != '' "> <if test="dto.totalGiftCoinsMax != null and dto.totalGiftCoinsMin == null ">
and sbr.total_gift_coins &lt;=#{dto.totalGiftCoinsMax,jdbcType=INTEGER} and sbr.total_gift_coins &lt;=#{dto.totalGiftCoinsMax,jdbcType=INTEGER}
</if> </if>
<if test="dto.totalGiftCoinsMin != null and dto.totalGiftCoinsMax != null " > <if test="dto.totalGiftCoinsMin != null and dto.totalGiftCoinsMax != null " >
and sbr.total_gift_coins between #{dto.totalGiftCoinsMin,jdbcType=INTEGER} and #{dto.totalGiftCoinsMax,jdbcType=INTEGER} and sbr.total_gift_coins between #{dto.totalGiftCoinsMin,jdbcType=INTEGER} and #{dto.totalGiftCoinsMax,jdbcType=INTEGER}
</if> </if>
<!-- 大哥等级筛选 --> <!-- 大哥等级筛选 -->
<if test="dto.levelMin != null and dto.levelMax == null and dto.levelMax != ''"> <if test="dto.levelMin != null and dto.levelMax == null ">
and sbr.level >=#{dto.levelMin,jdbcType=INTEGER} and sbr.level >=#{dto.levelMin,jdbcType=INTEGER}
</if> </if>
<if test="dto.levelMax != null and dto.levelMin == null and dto.levelMin != '' "> <if test="dto.levelMax != null and dto.levelMin == null ">
and sbr.level &lt;=#{dto.levelMax,jdbcType=INTEGER} and sbr.level &lt;=#{dto.levelMax,jdbcType=INTEGER}
</if> </if>
<if test="dto.levelMin != null and dto.levelMax != null " > <if test="dto.levelMin != null and dto.levelMax != null " >