From 059f19e02c94691d4fd32a0dc5b706632adb548d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 05 Jun 2025 17:14:17 +0800
Subject: [PATCH] feat(mall): 添加年排行功能并优化积分查询性能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 d57b70e..031f3a6 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
@@ -896,7 +896,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,6 +910,16 @@
if (orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该状态不能确认收货");
}
+ if(orderInfo.getDeliveryType().equals(1)){
+ List<MallOrderItem> mallOrderItems = mallOrderItemMapper.selectList(
+ new LambdaQueryWrapper<MallOrderItem>()
+ .eq(MallOrderItem::getOrderId, id)
+ .eq(MallOrderItem::getLeaderState, 0)
+ );
+ if(CollUtil.isNotEmpty(mallOrderItems)){
+ throw new FebsException("请先核销"+mallOrderItems.get(0).getGoodsName());
+ }
+ }
List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(null, orderInfo.getId(), 3);
if(CollUtil.isNotEmpty(mallRefundEntities)){
--
Gitblit v1.9.1