From e7ce2668a3aa187b425aebe04211c4d612ac9b21 Mon Sep 17 00:00:00 2001
From: zt <seesawgzz@gmail.com>
Date: Wed, 26 Feb 2025 14:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/member/enums/ErrorCodeConstants.java       | 2 ++
 .../yudao/module/member/service/order/OrderService.java     | 6 ++++++
 .../yudao/module/member/service/order/OrderServiceImpl.java | 2 +-
 .../member/service/orderdetail/OrderDetailServiceImpl.java  | 5 ++++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
index ca0c71f6..b9c2a4d9 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -78,6 +78,8 @@ public interface ErrorCodeConstants {
 
     ErrorCode DINING_PLATES_NOT_EXISTS = new ErrorCode(1_004_099_000, "餐盘不存在");
 
+    ErrorCode DINING_PLATES_NUM_NOT_EXISTS = new ErrorCode(1_004_099_000, "未读取到餐盘号");
+
     ErrorCode DINING_PLATES_ALREADY_BIND = new ErrorCode(1_004_099_001, "餐盘已被绑定");
     ErrorCode CARD_NOT_BIND = new ErrorCode(1_004_099_002, "请先绑定餐卡");
     ErrorCode DINING_PLATES_NOT_BIND = new ErrorCode(1_004_099_003, "餐盘未绑定");
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java
index 03990188..9cf2b022 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderService.java
@@ -82,6 +82,12 @@ public interface OrderService {
      */
     List<DishOrderDO> getToPayByOrder(List<Long> orderIds);
 
+    /**
+     * 获取用户的异常订单
+     * @return
+     */
+    List<DishOrderDO> getToPayByOrder(List<Long> orderIds);
+
     /**
      * 更改用户的支付状态
      * @return
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
index 4e86fe10..ea06f7c0 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java
@@ -334,7 +334,7 @@ public class OrderServiceImpl implements OrderService {
     public List<DishOrderDO> getToPayByOrder(List<Long> orderIds) {
         List<DishOrderDO> dishOrderDOS = dishOrderMapper.selectList(Wrappers.<DishOrderDO>lambdaQuery()
                 .in(DishOrderDO::getId, orderIds)
-                .eq(DishOrderDO::getOrderStatus, DishOrderDO.INCOMPLETE));
+                .eq(DishOrderDO::getOrderStatus, DishOrderDO.ABNORMAL));
         return dishOrderDOS;
     }
 
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
index b02be24c..fafed831 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java
@@ -36,6 +36,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.DINING_PLATES_NUM_NOT_EXISTS;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ORDER_DETAIL_NOT_EXISTS;
 
 /**
@@ -76,7 +77,9 @@ public class OrderDetailServiceImpl implements OrderDetailService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createOrderDetail(AppOrderDetailSaveReqVO createReqVO) {
-
+        if(StrUtil.isBlank(createReqVO.getDiningPlatesNum())){
+            throw exception(DINING_PLATES_NUM_NOT_EXISTS);
+        }
         DiningPlatesDO diningPlatesDO = diningPlatesService.getDiningPlatesByNum(createReqVO.getDiningPlatesNum(), createReqVO.getStoreId());
         if (diningPlatesDO == null ){
             diningPlatesDO = new DiningPlatesDO();