From b2e3347a9236293657feb1f23b06b2d438979677 Mon Sep 17 00:00:00 2001
From: xupei <1779019091@qq.com>
Date: Fri, 22 Sep 2023 13:41:55 +0800
Subject: [PATCH] =?UTF-8?q?design=20single=20submit=20bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/model/vo/DesignItemClothesDetailVO.java    |  2 +-
 .../ai/da/service/impl/DesignItemServiceImpl.java    | 12 +++++++-----
 .../com/ai/da/service/impl/DesignServiceImpl.java    |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java
index 77debdd3..faf48100 100644
--- a/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java
+++ b/src/main/java/com/ai/da/model/vo/DesignItemClothesDetailVO.java
@@ -12,7 +12,7 @@ import java.util.List;
 public class DesignItemClothesDetailVO {
 
     /**
-     * designItemDetail对应的businessId
+     * designItemDetail对应的Id
      */
     @ApiModelProperty("对应的上游id")
     private Long id;
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 f8584d1e..5158b7c8 100644
--- a/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
@@ -283,9 +283,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             , JSONObject outfit, String timeZone){
 
         DesignItem designItem = new DesignItem();
-        String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
+//        String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
         designItem.setUpdateDate(DateUtil.getByTimeZone(timeZone));
-        designItem.setDesignUrl(url);
+        designItem.setDesignUrl(outfit.getString("synthesis_url"));
         designItem.setId(designItemId);
 
         //更新designItem
@@ -316,7 +316,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             designItemDetail.setPrintJson(JSON.toJSONString(printObject));
             designItemDetails.add(designItemDetail);
         });
-        // todo businessId来源
+        // todo businessId 来自t_sys_file或者t_library
         designItemDetailService.saveBatch(designItemDetails);
 
         // 覆盖designPythonOutfit表中的模特全身图
@@ -376,8 +376,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         Assert.notNull(designItem,"design item does not exists!");
         Design design = designService.getById(designItem.getDesignId());
         Assert.notNull(design,"design does not exists!");
-        TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId());
-        Assert.notNull(designItem,"design item detail layers does not exists!");
+
         DesignLibraryModelPointVO designLibraryModelPointVO = null;
         // 设置模特
         if (Objects.nonNull(design.getTemplateId())){
@@ -414,6 +413,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail));
         });
 
+        TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId());
+        Assert.notNull(designItem,"design item detail layers does not exists!");
+
         return assembleDesignSingleResponse(designItem.getId(),minioUtil.splitThenGetPreviewUrl(designPythonOutfit.getDesignUrl(),480),
                 designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),detailsVO);
     }
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 1566ad14..04b33c86 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -809,7 +809,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                 .filter(f -> OUTWEAR_DRESS_BLOUSE.contains(f.getType()) || SKIRT_TROUSERS.contains(f.getType()))
                 .collect(Collectors.toList());
         response.setClothes(CopyUtil.copyList(filterDetail,DesignItemClothesDetailVO.class,(o,d)->{
-            d.setId(o.getBusinessId());
+            d.setId(o.getId());
             d.setLevel1Type(converTypeToLevel1(o.getType()));
             String printJson = o.getPrintJson();
             if (StringUtils.isEmpty(printJson)) {