Merge remote-tracking branch 'origin/dev/dev' into dev/dev

src/main/java/com/ai/da/service/impl/LibraryModelPointServiceImpl.java

@@ -72,20 +72,7 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
         // 标志是否有更改过模特比例（即更换模特图）
         boolean flag = !url.equals(libModel.getUrl());
 
-        if (libraryModelPointDTO.getIsCovered() && Objects.nonNull(libraryModelPointDTO.getTemplateId())){
+        if (libraryModelPointDTO.getIsCovered()){
-            // 覆盖保存，即更新原有数据（点位数据和模特图片）
-            LibraryModelPoint modelPoint = getById(libraryModelPointDTO.getTemplateId());
-            if (Objects.isNull(modelPoint)) {
-                throw new BusinessException("modelPoint.not.found");
-            }
-            // 更新点位信息
-            modelPoint = resolvePoint(libraryModelPointDTO);
-            modelPoint.setUpdateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
-            modelPoint.setId(libraryModelPointDTO.getTemplateId());
-            updateById(modelPoint);
-            libraryModelPointVO.setTemplateId(modelPoint.getId());
-            libraryModelPointVO.setRelationId(libraryModelPointDTO.getLibraryId());
-
             // 更新模特图片
             if (flag){
                 libModel.setUrl(url);
@@ -96,6 +83,30 @@ public class LibraryModelPointServiceImpl extends ServiceImpl<LibraryModelPointM
                 libModel.setUpdateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
                 libraryService.updateById(libModel);
             }
+
+            if (Objects.nonNull(libraryModelPointDTO.getTemplateId())){
+                // 覆盖保存，即更新原有数据（点位数据和模特图片）
+                LibraryModelPoint modelPoint = getById(libraryModelPointDTO.getTemplateId());
+                if (Objects.isNull(modelPoint)) {
+                    throw new BusinessException("modelPoint.not.found");
+                }
+                // 更新点位信息
+                modelPoint = resolvePoint(libraryModelPointDTO);
+                modelPoint.setUpdateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
+                modelPoint.setId(libraryModelPointDTO.getTemplateId());
+                updateById(modelPoint);
+                libraryModelPointVO.setTemplateId(modelPoint.getId());
+                libraryModelPointVO.setRelationId(libraryModelPointDTO.getLibraryId());
+            }else {
+                // 新增模特点位信息
+                LibraryModelPoint libraryModelPoint = resolvePoint(libraryModelPointDTO);
+                libraryModelPoint.setModelType("Library");
+                libraryModelPoint.setCreateDate(DateUtil.getByTimeZone(libraryModelPointDTO.getTimeZone()));
+                save(libraryModelPoint);
+                libraryModelPointVO.setTemplateId(libraryModelPoint.getId());
+                libraryModelPointVO.setRelationId(libraryModelPointDTO.getLibraryId());
+            }
+
         }else {
             // 不覆盖，即另存为
             // 新增模特library信息