From 92c26cea4de00349b346f71da3cf530b26c31eb0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 10 Jun 2025 09:40:59 +0800
Subject: [PATCH] fix(mall): 修复用户重复加入标签的问题

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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..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,7 +910,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