From c39640ffde7b4e1190859b8aee8b0bec31d9d631 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 3 Apr 2026 16:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=20=E5=8D=95?=
 =?UTF-8?q?=E5=BC=80=20=E6=94=AF=E4=BB=98=20=E5=B0=B1=E9=A4=90=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/PrintMachineController.java         | 25 +++++++++++++++++++
 .../java/com/czg/order/dto/CheckOrderPay.java |  5 ++++
 .../impl/OrderInfoCustomServiceImpl.java      |  3 +++
 3 files changed, 33 insertions(+)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
index b7e1b287f..c7eafb8b7 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
@@ -60,6 +60,31 @@ public class PrintMachineController {
         return CzgResult.success(page);
     }
 
+    /**
+     * 打印机列表
+     * @param name 名称
+     * @return 打印机列表
+     */
+    @GetMapping("/getPrintLocal")
+    public CzgResult<Page<PrintMachine>> getPrintLocal(String name, String subType) {
+        QueryWrapper queryWrapper = new QueryWrapper().eq(PrintMachine::getShopId, StpKit.USER.getShopId());
+        if (StrUtil.isNotBlank(name)) {
+            queryWrapper.like(PrintMachine::getName, name);
+        }
+        queryWrapper.in(PrintMachine::getConnectionType, "USB", "局域网");
+        if (StrUtil.isNotBlank(subType)) {
+            queryWrapper.eq(PrintMachine::getSubType, subType);
+        }
+        queryWrapper.orderBy(PrintMachine::getSort, true).orderBy(PrintMachine::getId, false);
+        Page<PrintMachine> page = printMachineService.page(PageUtil.buildPage(), queryWrapper);
+        page.getRecords().forEach(item -> {
+            if (StrUtil.isNotBlank(item.getCategoryIds())) {
+                item.setCategoryList(JSONArray.parse(item.getCategoryIds()));
+            }
+        });
+        return CzgResult.success(page);
+    }
+
     /**
      * 打印机详情
      * @param id 打印机id
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
index 846936d10..aecc53fdf 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
@@ -33,6 +33,11 @@ public class CheckOrderPay implements Serializable {
     private boolean withCoupon = true;
     private boolean withPoints = true;
 
+    /**
+     * 用餐模式 堂食 dine-in  外带 take-out 外卖 take-away
+     */
+    private String dineMode;
+
     @NotNull(message = "订单id不可为空")
     private Long orderId;
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index 3fceceefa..fcad9cabc 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -362,6 +362,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
                 throw new OrderCancelException("订单已过期,请重新下单");
             }
         }
+        if (StrUtil.isNotBlank(param.getDineMode())) {
+            orderInfo.setDineMode(param.getDineMode());
+        }
         ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
         AssertUtil.isNull(shopInfo, "生成订单失败，店铺信息不存在");
         if (param.isVipPrice() && !shopInfo.getIsMemberPrice().equals(1)) {