From 6f9672baa8875bbdfd228cc7d002d9ce05533e9e Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Wed, 20 Nov 2024 17:24: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

---
 .../controller/admin/storeorder/StoreOrderController.java     | 4 ++--
 .../controller/admin/storeorder/vo/StoreOrderDetailVO.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java
index 18d1a756..b0cd4343 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/StoreOrderController.java
@@ -90,8 +90,8 @@ public class StoreOrderController {
         MemberUserDO user = userService.getUser(storeOrder.getUserId());
         storeOrderDetailVO.setNickName(user.getNickname());
         storeOrderDetailVO.setMobile(user.getMobile());
-        String storeName = cashregisterinfoApi.getStoreName(storeOrder.getEquipmentCode());
-        storeOrderDetailVO.setStoresName(storeName);
+//        String storeName = cashregisterinfoApi.getStoreName(storeOrder.getEquipmentCode());
+//        storeOrderDetailVO.setStoresName(storeName);
         List<AppStoreOrderDetailVo> listByOrderNo = orderDetailService.getListByOrderNo(storeOrder.getOrderId());
         storeOrderDetailVO.setDetailDOS(listByOrderNo);
         return success(storeOrderDetailVO);
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderDetailVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderDetailVO.java
index b09e7325..c92b7145 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderDetailVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderDetailVO.java
@@ -39,7 +39,7 @@ public class StoreOrderDetailVO {
     private String mobile;
     @Schema(description = "门店", example = "1722")
     private String storesName;
-
+    private Long carteenId;
 
     @Schema(description = "订单详情")
     private List<AppStoreOrderDetailVo> detailDOS;