From 8a48e474a1ee236284a516f81e3d27f3293309a6 Mon Sep 17 00:00:00 2001
From: Fdily <2949549024@qq.com>
Date: Tue, 28 Apr 2026 14:08:15 +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

---
 .../impl/TtRollJackpotOrnamentsServiceImpl.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollJackpotOrnamentsServiceImpl.java b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollJackpotOrnamentsServiceImpl.java
index 8b38909..57bd60a 100644
--- a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollJackpotOrnamentsServiceImpl.java
+++ b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollJackpotOrnamentsServiceImpl.java
@@ -56,8 +56,14 @@ public class TtRollJackpotOrnamentsServiceImpl extends ServiceImpl<TtRollJackpot
                 .list();
         BigDecimal total = BigDecimal.ZERO;
         for (TtRollJackpotOrnaments item : list){
-            if (item.getPrice() == null) continue;
-            total = total.add(item.getPrice().multiply(new BigDecimal(item.getOrnamentsNum())));
+            BigDecimal price = item.getPrice();
+            if (price == null) {
+                // price 为 null 时，关联查询 tt_ornament 表用 use_price 兼容旧数据
+                TtOrnament ornament = ttOrnamentMapper.selectById(item.getOrnamentsId());
+                price = (ornament != null && ornament.getUsePrice() != null)
+                        ? ornament.getUsePrice() : BigDecimal.ZERO;
+            }
+            total = total.add(price.multiply(new BigDecimal(item.getOrnamentsNum())));
         }
         new LambdaUpdateChainWrapper<>(ttRollJackpotMapper)
                 .eq(TtRollJackpot::getJackpotId,rollJOEdit.getJackpotId())