From 0f084c27ea32ed169bdd491a61183a1dda4daf57 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 26 Sep 2025 18:25:40 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:1.=20singleDesign=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=AF=B9=202.=20=E5=8D=95=E5=93=81d?=
 =?UTF-8?q?esign=E9=80=9A=E8=BF=87=E4=BC=98=E5=85=88=E7=BA=A7=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=9B=BE=E5=B1=82=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/impl/DesignServiceImpl.java    | 8 +++++---
 .../java/com/ai/da/service/impl/PanToneServiceImpl.java   | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index d79756aa..fa909548 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -1487,7 +1487,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         response.getOthers().removeIf(o -> !minioUtil.doesObjectExist(o.getMinIOPath()));
         return editDesignItemLayer(flag, designPythonOutfit,
                 minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
-                editResponseColor(designItemDetails, response));
+                editResponseColor(designItemDetails, response), design);
     }
 
     @Override
@@ -1623,7 +1623,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         return designItemDetailVO;
     }
 
-    private DesignItemDetailVO editDesignItemLayer(Boolean flag, TDesignPythonOutfit designPythonOutfit, String designItemUrl, DesignItemDetailVO designItemDetailVO) {
+    private DesignItemDetailVO editDesignItemLayer(Boolean flag, TDesignPythonOutfit designPythonOutfit, String designItemUrl, DesignItemDetailVO designItemDetailVO, Design design) {
         ArrayList<DesignPythonOutfitVO> detailsVO = new ArrayList<>();
 
         if (flag) {
@@ -1635,7 +1635,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             }
 
             // 为没有优先级的图层添加优先级
-            designPythonOutfitDetailService.setDesignPythonOutfitDetailPriority(details);
+            if (!StringUtil.isNullOrEmpty(design.getSingleOverall()) && design.getSingleOverall().equals("overall")){
+                designPythonOutfitDetailService.setDesignPythonOutfitDetailPriority(details);
+            }
 
             details.forEach(detail -> {
                 detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail, null));
diff --git a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java
index a0a98a82..21a4a936 100644
--- a/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java
@@ -188,6 +188,9 @@ public class PanToneServiceImpl extends ServiceImpl<PanToneMapper, PanTone> impl
         if (Objects.isNull(pantoneVO)) {
             pantoneVO = new PantoneVO(rgb[0], rgb[1], rgb[2], hsv[0], hsv[1], hsv[2]);
         }
+        pantoneVO.setR(rgb[0]);
+        pantoneVO.setG(rgb[1]);
+        pantoneVO.setB(rgb[2]);
         return pantoneVO;
     }