From 4189c991a1921f0d6be7d863ae1d24e2f650a300 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sat, 15 Feb 2025 09:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B7=AF=E5=BE=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/PayController.java     |  2 +-
 .../com/czg/order/dto/OrderInfoQueryDTO.java  | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/PayController.java b/cash-api/order-server/src/main/java/com/czg/controller/PayController.java
index ddfb5c34..41018e0c 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/PayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/PayController.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @description
  */
 @RestController
-@RequestMapping("/admin/pay")
+@RequestMapping("/pay")
 public class PayController {
     @Resource
     private PayService payService;
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
index 4c25165f..aacd5bc8 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoQueryDTO.java
@@ -47,24 +47,30 @@ public class OrderInfoQueryDTO implements Serializable {
     private String tableName;
 
     /**
-     * 发货类型post快递，takeaway外卖,takeself,自提table---堂食
-     */
-    private String sendType;
-
-    /**
-     * 订单类型-cash收银-miniapp小程序-offline线下
+     * 订单类型-cash收银(除小程序以外 都属于收银)  miniapp小程序
      */
     private String orderType;
+    /**
+     * 平台类型  pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端
+     */
+    private String platformType;
+
 
+    /**
+     * dineMode 用餐模式 堂食 dine-in  外带 take-out 外卖 take-away
+     */
+    private String sendType;
     /**
      * 支付类型
+     * 主扫 main-scan
+     * 被扫 back-scan
+     * 微信小程序 wechat-mini
+     * 支付宝小程序 alipay-mini
+     * 会员支付 vip-pay
+     * 现金支付 cash-pay
      */
     private String payType;
 
-    /**
-     * 平台类型
-     */
-    private String platformType;
 
     /**
      * 状态: unpaid-待支付;in-production 制作中;wait-out 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part-refund 部分退单;cancelled-取消订单