From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 9f029d3..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
@@ -257,6 +257,12 @@
                     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());
@@ -281,6 +287,11 @@
                     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());
@@ -505,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);
@@ -862,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