From 9c5fc1ba2c5ce99c484e9ed13f0ea8353db57022 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Tue, 5 Jan 2021 10:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=8A=A5=E9=A4=90=EF=BC=9A?=
 =?UTF-8?q?=E7=94=A8=E9=A4=90=E6=B5=81=E6=B0=B4=EF=BC=88=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=89=E6=9F=A5=E7=9C=8B,=E8=8E=B7=E5=8F=96=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E8=AE=A2=E9=A4=90=E5=8F=82=E6=95=B0,=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8F=9C=E5=93=81=E6=B8=85=E5=8D=95,=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=AE=A2=E9=A4=90=E4=BC=98=E6=83=A0=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/controller/ClientController.java  | 61 +++++++++++++++++--
 1 file changed, 55 insertions(+), 6 deletions(-)

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 874d526a0..2edc4d82a 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
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.fantang.domain.FtConfigDao;
 import com.ruoyi.system.fantang.domain.FtFoodDao;
 import com.ruoyi.system.fantang.domain.FtOrderDao;
 import com.ruoyi.system.fantang.domain.FtStaffSubsidyDao;
@@ -48,6 +49,9 @@ public class ClientController extends BaseController {
     @Autowired
     private IFtFoodDaoService foodDaoService;
 
+    @Autowired
+    private IFtOrderDaoService iFtOrderDaoService;
+
     /**
      * 获取用餐时间信息
      * 日期：2020年12月11日
@@ -316,7 +320,7 @@ public class ClientController extends BaseController {
     @GetMapping("/getStaffSubsidy/{staffId}")
     public AjaxResult getStaffSubsidy(@PathVariable Long staffId) {
         QueryWrapper<FtStaffSubsidyDao> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",staffId);
+        wrapper.eq("staff_id", staffId);
 
         return AjaxResult.success(staffSubsidyDaoService.list(wrapper));
     }
@@ -325,13 +329,13 @@ public class ClientController extends BaseController {
      * 查看补贴余额
      */
     @GetMapping("/getStaffSubsidyBalance/{staffId}")
-    public AjaxResult getStaffSubsidyBalance(@PathVariable Long staffId){
+    public AjaxResult getStaffSubsidyBalance(@PathVariable Long staffId) {
         QueryWrapper<FtStaffSubsidyDao> wrapper = new QueryWrapper<>();
-        wrapper.eq("staff_id",staffId);
+        wrapper.eq("staff_id", staffId);
         wrapper.orderByDesc("price");
         wrapper.last("limit 1");
         FtStaffSubsidyDao staffSubsidyDao = staffSubsidyDaoService.getOne(wrapper);
-        
+
         return AjaxResult.success(staffSubsidyDao.getPrice());
     }
 
@@ -339,11 +343,56 @@ public class ClientController extends BaseController {
      * 查看商品清单
      */
     @GetMapping("/getGoodsList")
-    public AjaxResult getGoodsList(){
+    public AjaxResult getGoodsList() {
         QueryWrapper<FtFoodDao> wrapper = new QueryWrapper<>();
-        wrapper.eq("type",2);
+        wrapper.eq("type", 2);
         List<FtFoodDao> list = foodDaoService.list(wrapper);
 
         return AjaxResult.success(list);
     }
+
+    /**
+     * 用餐流水（订单）查看
+     */
+    @GetMapping("/getStaffOrder/{staffId}")
+    public AjaxResult getStaffOrder(@PathVariable Long staffId) {
+        QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("staff_id", staffId);
+
+        return AjaxResult.success(iFtOrderDaoService.list(wrapper));
+    }
+
+    /**
+     * 获取截止订餐参数
+     */
+    @GetMapping("/getStopDinnerTime")
+    public AjaxResult getStopDinnerTime() {
+        QueryWrapper<FtConfigDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("config_key", "stop_dinner");
+        FtConfigDao ftConfigDao = iFtConfigDaoService.getOne(wrapper);
+
+        return AjaxResult.success(ftConfigDao.getConfigValue());
+    }
+
+    /**
+     * 获取菜品清单
+     */
+    @GetMapping("/getFoodList")
+    public AjaxResult getFoodList() {
+        QueryWrapper<FtFoodDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("type", 1);
+        List<FtFoodDao> list = foodDaoService.list(wrapper);
+
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取订餐优惠比例
+     */
+    @GetMapping("/getOrderDiscount/{orderId}")
+    public AjaxResult getOrderDiscount(@PathVariable Long orderId) {
+        FtOrderDao ftOrderDao = orderDaoService.getById(orderId);
+
+        return AjaxResult.success(ftOrderDao.getDiscount());
+    }
 }