From 77f0205db7a5b9f3d0da4c8e18b7a706d5cf37b7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 17 Mar 2026 17:06:31 +0800
Subject: [PATCH] refactor(yinhe): 移除产品ID查询条件和DTO字段
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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..ac5d72b 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
@@ -18,7 +18,6 @@
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.IXcxPayService;
-import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -67,7 +66,6 @@
private final MallGoodsCouponMapper mallGoodsCouponMapper;
private final MallExpressInfoMapper mallExpressInfoMapper;
- private final AgentProducer agentProducer;
private final IXcxPayService iXcxPayService;
private final IPayService payService;
private final MallMemberMapper mallMemberMapper;
@@ -257,6 +255,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 +285,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 +514,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);
@@ -554,9 +566,6 @@
BigDecimal realAmount = total.subtract(discountAmount).add(deliveryAmount).setScale(2, RoundingMode.DOWN);
orderInfo.setRealAmount(realAmount);
clothesOrderMapper.updateById(orderInfo);
-
- //过期时间修改成24小时
- agentProducer.sendClothesOrderCancelDelayMsg(orderInfo.getId(), 24 * 60 * 60 * 1000L);
ApiClothesOrderInfoVo apiClothesOrderInfoVo = new ApiClothesOrderInfoVo();
apiClothesOrderInfoVo.setOrderId(orderInfo.getId());
@@ -862,7 +871,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