From de8b3cf7a9b22be7abcb544a53dcea7f1b340760 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 20 Aug 2025 17:23:14 +0800
Subject: [PATCH] feat(ai): 新增开始答题V2 接口

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
index a6c9631..ea2ca5e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java
@@ -210,6 +210,8 @@
         ClothesOrderDraft clothesOrderDraft = clothesOrderDraftMapper.selectById(id);
 
         if (ObjectUtil.isNotNull(clothesOrderDraft)){
+            Long draftId = clothesOrderDraft.getId();
+
             Long typeId = clothesOrderDraft.getTypeId();
             ClothesType clothesType = clothesTypeMapper.selectById(typeId);
             record.setTypeId(typeId);
@@ -226,6 +228,7 @@
                         record.setSizeId(sizeId);
                         record.setSizeName(clothesSize.getName());
                         record.setSizePrice(clothesSize.getPrice());
+                        record.setSizeImage(clothesSize.getImage());
                     }
                 }
             }
@@ -240,7 +243,7 @@
             BigDecimal totalPatternPrice = BigDecimal.ZERO;
             List<ClothesPatternRemark> clothesPatternRemarks = clothesPatternRemarkMapper.selectList(
                     Wrappers.lambdaQuery(ClothesPatternRemark.class)
-                            .eq(ClothesPatternRemark::getSourceId, record.getId())
+                            .eq(ClothesPatternRemark::getSourceId, draftId)
                             .eq(ClothesPatternRemark::getType, SocialPatternLocationTypeEnum.DRAFT.getValue())
             );
             if(CollUtil.isNotEmpty(clothesPatternRemarks)){
@@ -253,6 +256,13 @@
                     vo.setPatternName(clothesPattern.getName());
                     vo.setPatternPrice(clothesPattern.getPrice());
                     vo.setPatternRemark(entity.getRemark());
+                    vo.setPatternImage(clothesPattern.getImage());
+                    vo.setBoxHeight(clothesPattern.getBoxHeight());
+                    vo.setBoxWidth(clothesPattern.getBoxWidth());
+                    vo.setLeftPercent(clothesPattern.getLeftPercent());
+                    vo.setTopPercent(clothesPattern.getTopPercent());
+
+
                     vos.add(vo);
 
                     totalPatternPrice = totalPatternPrice.add(clothesPattern.getPrice());
@@ -263,7 +273,7 @@
             BigDecimal totalLocationPrice = BigDecimal.ZERO;
             List<ClothesLocationRemark> clothesLocationRemarks = clothesLocationRemarkMapper.selectList(
                     Wrappers.lambdaQuery(ClothesLocationRemark.class)
-                            .eq(ClothesLocationRemark::getSourceId, record.getId())
+                            .eq(ClothesLocationRemark::getSourceId, draftId)
                             .eq(ClothesLocationRemark::getType, SocialPatternLocationTypeEnum.DRAFT.getValue())
             );
             if(CollUtil.isNotEmpty(clothesLocationRemarks)){
@@ -276,6 +286,12 @@
                     vo.setLocationName(location.getName());
                     vo.setLocationPrice(location.getPrice());
                     vo.setLocationRemark(entity.getRemark());
+                    vo.setLocationImage(location.getImage());
+
+                    vo.setBoxHeight(location.getBoxHeight());
+                    vo.setBoxWidth(location.getBoxWidth());
+                    vo.setLeftPercent(location.getLeftPercent());
+                    vo.setTopPercent(location.getTopPercent());
                     vos.add(vo);
 
                     totalLocationPrice = totalLocationPrice.add(location.getPrice());
@@ -293,6 +309,7 @@
                         record.setArtId(artId);
                         record.setArtName(clothesArt.getName());
                         record.setArtPrice(clothesArt.getPrice());
+                        record.setArtImage(clothesArt.getImage());
                     }
                 }
             }
@@ -307,6 +324,7 @@
                         record.setClothId(clothId);
                         record.setClothName(clothesCloth.getName());
                         record.setClothPrice(clothesCloth.getPrice());
+                        record.setClothImage(clothesCloth.getImage());
                     }
                 }
             }
@@ -498,6 +516,9 @@
                 continue;
             } else if (ClothesOrderItemEnum.CUSTOMIZE.getCode() == item.getType()) {
                 ClothesMemberStature clothesMemberStature = clothesMemberStatureMapper.selectById(item.getSkuId());
+                if (ObjectUtil.isNull(clothesMemberStature)){
+                    throw new FebsException("请选择您的自定义尺码");
+                }
                 orderItem.setItemId(clothesMemberStature.getId());
                 orderItem.setName(clothesMemberStature.getName());
                 orderItem.setPrice(BigDecimal.ZERO);
@@ -855,7 +876,7 @@
         if(ObjectUtil.isNull(orderInfo)){
             throw new FebsException("订单不存在");
         }
-        if (member.getId() != orderInfo.getMemberId()) {
+        if (!ObjectUtil.equal(member.getId(), orderInfo.getMemberId())) {
             throw new FebsException("无权限操作");
         }
         if (ClothesEnum.UP.getCode() == orderInfo.getDelFlag()) {

--
Gitblit v1.9.1