From 0787025151983ee346e5bdb7982dc888124824e4 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Thu, 15 Jan 2026 14:07:18 +0800
Subject: [PATCH] =?UTF-8?q?TASK:merge=20=E6=A8=A1=E5=BC=8F=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Emask?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/AccountServiceImpl.java    |  2 +-
 .../ai/da/service/impl/DesignItemServiceImpl.java | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
index b376f5be..f8766168 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -2507,7 +2507,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             }
 
             // 判断当前账号的有效期是否与管理员同步
-            if (subAccount.getValidEndTime() < adminAcc.getValidEndTime()){
+            if (Objects.isNull(subAccount.getValidEndTime()) || subAccount.getValidEndTime() < adminAcc.getValidEndTime()){
                 subAccount.setValidEndTime(adminAcc.getValidEndTime());
             }
 
diff --git a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
index 10f382dc..afd1137d 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -485,14 +485,6 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                     .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset));
         }
 
-        // 图层与mask对应关系，衣服前后片的mask是相同的
-        Map<Integer, String> priorityMask = null;
-        // 如果是merge模式 则使用入参中的mask
-        if (designType.equals("merge")) {
-            priorityMask = designSingleItemDTOList.stream()
-                    .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getMaskMinioUrl));
-        }
-
         List<TDesignPythonOutfitDetail> list = new ArrayList<>();
         for (int i = 0; i < layers.size(); i++) {
             JSONObject jsonObject = layers.getJSONObject(i);
@@ -514,12 +506,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             designPythonOutfitDetail.setImageUrl(jsonObject.getString("image_url"));
             designPythonOutfitDetail.setImageSize(jsonObject.getString("image_size"));
             designPythonOutfitDetail.setImageCategory(jsonObject.getString("image_category"));
-            if (designType.equals("merge")) {
-                designPythonOutfitDetail.setMaskUrl(priorityMask.get(Math.abs(priority)));
-            } else {
-                designPythonOutfitDetail.setMaskUrl(jsonObject.getString("mask_url"));
-            }
-
+            designPythonOutfitDetail.setMaskUrl(jsonObject.getString("mask_url"));
             designPythonOutfitDetail.setScale(Objects.isNull(jsonObject.getString("resize_scale")) ? "1.0" : jsonObject.getString("resize_scale"));
             designPythonOutfitDetail.setUserId(userId);
             if (priorityOffset != null && !priorityOffset.isEmpty()){