From 63d7660df3e8607289d5f8ce52a2dc8b12a360b1 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Fri, 8 Jan 2021 16:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/ClientController.java  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
index 91b4fe3ec..4c4224415 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
@@ -51,6 +51,9 @@ public class ClientController extends BaseController {
     @Autowired
     private IFtOrderDaoService iFtOrderDaoService;
 
+    @Autowired
+    private IFtFoodDefaultDaoService foodDefaultDaoService;
+
     /**
      * 获取用餐时间信息
      * 日期：2020年12月11日
@@ -381,6 +384,18 @@ public class ClientController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 获取各餐品的价格清单
+     * @author : 陈智兴
+     * @param
+     */
+    @GetMapping("/getDinnerPriceList")
+    public AjaxResult getDinnerPriceList() {
+        List<FtFoodDefaultDao> list = foodDefaultDaoService.list(null);
+        return AjaxResult.success(list);
+    }
+
+
     /**
      * 获取订餐优惠比例
      */
@@ -399,7 +414,9 @@ public class ClientController extends BaseController {
     public AjaxResult orderCollection(@RequestBody JSONObject params) {
 
         // 订单 id
-        Integer orderId = params.getInteger("orderId");
+        Integer orderId = params.getInteger("staffId");
+        // 订餐类型
+        Integer type = params.getInteger("type");
 
         // 实收
         BigDecimal receipts = params.getBigDecimal("receipts");