From 81d88da5d18e7ede2a7b0c7304604358cacaf3e3 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Thu, 17 Dec 2020 18:00:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fantang/controller/ClientController.java  |  2 +-
 .../system/fantang/service/IFtOrderDaoService.java   |  2 ++
 .../fantang/service/impl/FtOrderDaoServiceImpl.java  | 12 +++++++++---
 3 files changed, 12 insertions(+), 4 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 25e4c45a6..5829adec8 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
@@ -66,7 +66,7 @@ public class ClientController extends BaseController {
 
     @GetMapping("/getAvailableOrder/{staffId}")
     public AjaxResult getAvailableOrder(@PathVariable("staffId") Integer staffId) {
-        return AjaxResult.success("调用有效订单成功");
+        return AjaxResult.success(orderDaoService.getAvailableOrder(staffId));
     }
 
     /**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java
index 15f320d4b..f9c8dff8e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtOrderDaoService.java
@@ -17,4 +17,6 @@ public interface IFtOrderDaoService extends IService<FtOrderDao> {
     AjaxResult getOrderOfToday(Long staffId);
 
     Integer insertOrder(Long staffId, Integer orderType, Date demandDate);
+
+    AjaxResult getAvailableOrder(Integer staffId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
index 6ee885971..4e880f8ba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtOrderDaoServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.fantang.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -34,9 +35,6 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
         wrapper.eq("staff_id", staffId);
         wrapper.between("order_date", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()));
         List<FtOrderDao> daos = this.baseMapper.selectList(wrapper);
-        for (FtOrderDao dao : daos) {
-            dao.setOrderTypeString(dao.getOrderType().toString());
-        }
         return AjaxResult.success(daos);
     }
 
@@ -48,4 +46,12 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
         dao.setOrderDate(demandDate);
         return this.baseMapper.insert(dao);
     }
+
+    @Override
+    public AjaxResult getAvailableOrder(Integer staffId) {
+        QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("staff_id", staffId);
+        List<FtOrderDao> daos = this.baseMapper.selectList(wrapper);
+        return AjaxResult.success(daos);
+    }
 }