From 3bfb50eb7a505c634f0d76ec12ffa68d3f281e85 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 04 Aug 2025 14:03:48 +0800
Subject: [PATCH] feat(ai): 添加 AI 产品相关接口和功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 2160e22..e7e5c42 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -34,6 +34,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -871,8 +872,15 @@
}
}
- MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
- if(ObjectUtil.isNotEmpty(expressInfo)){
+ MallExpressInfo expressInfo = expressInfoMapper.selectOne(
+ Wrappers.lambdaQuery(MallExpressInfo.class)
+ .eq(MallExpressInfo::getOrderId, orderInfo.getId())
+ .eq(MallExpressInfo::getOrderNo, orderInfo.getOrderNo())
+ .last("limit 1")
+ );
+
+// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+ if(ObjectUtil.isNotNull(expressInfo)){
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
}
@@ -896,7 +904,13 @@
@Transactional(rollbackFor = Exception.class)
public void confirmOrder(Long id) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+// MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+ MallOrderInfo orderInfo = this.baseMapper.selectOne(
+ new LambdaQueryWrapper<MallOrderInfo>()
+ .eq(MallOrderInfo::getMemberId, member.getId())
+ .eq(MallOrderInfo::getId, id)
+ .last("limit 1")
+ );
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
throw new FebsException("订单不存在");
}
@@ -904,7 +918,7 @@
if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该状态不能确认收货");
}
- if(1 == orderInfo.getDeliveryType()){
+ if(orderInfo.getDeliveryType().equals(1)){
List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
new LambdaQueryWrapper<MallOrderItem>()
.eq(MallOrderItem::getOrderId, id)
--
Gitblit v1.9.1