From db76c417532fdb820b78bca0ad40b0148eafc505 Mon Sep 17 00:00:00 2001 From: Fdily <2949549024@qq.com> Date: Tue, 28 Apr 2026 10:34:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odcs2.com/src/views/Home/common/knapsack.vue | 23 +-- .../src/views/rollHome/common/rolldetial.vue | 29 ++-- ruoyi-ui/src/api/skins/ttRoll/api.js | 29 +++- ruoyi-ui/src/views/skins/ttRoll/index.vue | 133 +++++++++++++++--- .../ruoyi/domain/entity/roll/TtRollCdk.java | 47 +++++++ .../ruoyi/domain/vo/RollDetailsDataVO.java | 3 + .../admin/controller/TtRollController.java | 40 +++++- .../ruoyi/admin/mapper/TtRollCdkMapper.java | 17 +++ .../ruoyi/admin/service/TtRollCdkService.java | 28 ++++ .../service/impl/TtRollCdkServiceImpl.java | 72 ++++++++++ .../ruoyi/admin/mapper/TtRollCdkMapper.xml | 12 ++ .../controller/ApiRollController.java | 3 + .../service/impl/ApiRollServiceImpl.java | 47 ++++++- 13 files changed, 428 insertions(+), 55 deletions(-) create mode 100644 skins-model/src/main/java/com/ruoyi/domain/entity/roll/TtRollCdk.java create mode 100644 skins-service/service-admin/src/main/java/com/ruoyi/admin/mapper/TtRollCdkMapper.java create mode 100644 skins-service/service-admin/src/main/java/com/ruoyi/admin/service/TtRollCdkService.java create mode 100644 skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollCdkServiceImpl.java create mode 100644 skins-service/service-admin/src/main/resources/com/ruoyi/admin/mapper/TtRollCdkMapper.xml diff --git a/odcs2.com/src/views/Home/common/knapsack.vue b/odcs2.com/src/views/Home/common/knapsack.vue index 35f7970..b58a3ab 100644 --- a/odcs2.com/src/views/Home/common/knapsack.vue +++ b/odcs2.com/src/views/Home/common/knapsack.vue @@ -19,31 +19,10 @@
-
饰品总数：{{ totalOrnamentNumber }}
-
-
饰品总价值：{{ totalOrnamentPrice }}
+
物品总数：{{ totalOrnamentNumber }}
-
-
- {{ selected }} -
-
默认排序
-
价格从低到高
-
价格从高到低
-
-
-
- - 🔍 -
-
diff --git a/odcs2.com/src/views/rollHome/common/rolldetial.vue b/odcs2.com/src/views/rollHome/common/rolldetial.vue index 581e9fa..f4b62ec 100644 --- a/odcs2.com/src/views/rollHome/common/rolldetial.vue +++ b/odcs2.com/src/views/rollHome/common/rolldetial.vue @@ -157,7 +157,7 @@ name id style="serch" - placeholder="请输入ROLL房密码" + :placeholder="obj.hasCdk ? '请输入CDK码' : '请输入ROLL房密码'" />
@@ -239,13 +239,6 @@ export default { this.RollPlayers(); this.RollPrizePool(); this.RollOpenPrize(); - // autoJoin: 如果是从列表页点击“立即加入”跳转过来 - if (localStorage.getItem('autoJoin') === '1') { - localStorage.removeItem('autoJoin'); - this.$nextTick(() => { - setTimeout(() => { this.handlejoin(); }, 600); - }); - } }, beforeDestroy() { if (this.countdownTimer) clearInterval(this.countdownTimer); @@ -347,7 +340,10 @@ export default { this.pass = ""; }, join() { - joinRoll(this.id, this.pass).then((res) => { + // CDK房间传 cdkCode，普通密码房间传 rollPassword + const rollPassword = this.obj.hasCdk ? "" : this.pass; + const cdkCode = this.obj.hasCdk ? this.pass : ""; + joinRoll(this.id, rollPassword, cdkCode).then((res) => { console.log("加入roll房", res); if (res.data.code == 200) { console.log("加入成功"); @@ -374,7 +370,14 @@ export default { }, handlejoin() { console.log(111); - if (this.obj.hasPW) { + // 已加入该房间则不再重复弹窗 + const myUserId = this.USER_INFO && this.USER_INFO.userId; + if (myUserId && this.playerList.some(p => p.userId === myUserId)) { + this.$message({ message: '您已在该房间内，请等待开奖', type: 'info', customClass: 'log_warning' }); + return; + } + // 有普通密码或有CDK，都需要弹出输入框 + if (this.obj.hasPW || this.obj.hasCdk) { this.isjoin = true; return; } @@ -391,8 +394,14 @@ export default { // this.getDetial(); }, getDetial() { + // autoJoin: 如果是从列表页点击"立即加入"跳转过来，等详情加载完再触发 + const autoJoin = localStorage.getItem('autoJoin') === '1'; + if (autoJoin) localStorage.removeItem('autoJoin'); getRollDetial(this.id).then((res) => { this.obj = res.data.data; + if (autoJoin) { + this.$nextTick(() => { this.handlejoin(); }); + } this.list = this.obj.jackpotOrnamentsDataList.sort((a, b) => { return b.price - a.price; }); diff --git a/ruoyi-ui/src/api/skins/ttRoll/api.js b/ruoyi-ui/src/api/skins/ttRoll/api.js index 368b0e1..ec6fd38 100644 --- a/ruoyi-ui/src/api/skins/ttRoll/api.js +++ b/ruoyi-ui/src/api/skins/ttRoll/api.js @@ -212,4 +212,31 @@ export function addRobot(data) { method: "post", data: data }); -} \ No newline at end of file +} + +// ---- CDK 相关接口 ---- + +/** 为Roll房批量生成CDK */ +export function generateRollCdk(data) { + return request({ + url: '/admin/roll/cdk/generate', + method: 'post', + data: data + }); +} + +/** 查询Roll房CDK列表 */ +export function getRollCdkList(rollId) { + return request({ + url: `/admin/roll/cdk/list/${rollId}`, + method: 'get' + }); +} + +/** 删除CDK */ +export function deleteRollCdk(cdkId) { + return request({ + url: `/admin/roll/cdk/${cdkId}`, + method: 'delete' + }); +} diff --git a/ruoyi-ui/src/views/skins/ttRoll/index.vue b/ruoyi-ui/src/views/skins/ttRoll/index.vue index 99635c9..8b7f7fa 100644 --- a/ruoyi-ui/src/views/skins/ttRoll/index.vue +++ b/ruoyi-ui/src/views/skins/ttRoll/index.vue @@ -117,6 +117,7 @@ 修改 详情 装备列表 + CDK 房间用户 @@ -185,20 +186,14 @@ 为空表示无密码 - - - - - - - 为0时表示不做限制 - + + + + + 填0则不启用CDK模式，使用普通密码 + +
取 消 @@ -281,6 +276,53 @@ 关 闭
+ + + +
+ + 批量生成 +
+ + + + + + + + + + + + + + +
+ 关 闭 +
+ +