From bb0adb833a0fef087af0f5667b62286612875197 Mon Sep 17 00:00:00 2001
From: "28353131@qq.com" <28353131@qq.com>
Date: Thu, 24 Dec 2020 22:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E9=A4=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=85=88=E5=88=A0=E9=99=A4=E5=81=9C=E9=A4=90?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FtOrderDaoServiceImpl.java      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 dbcc5274d..905ea2c5e 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
@@ -44,6 +44,14 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     @Override
     public Integer insertOrder(Long staffId, Integer orderType, Date demandDate) {
+        // 先删除停餐记录，再添加订餐记录
+        QueryWrapper<FtStaffStopMealsDao> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("staff_id", staffId);
+        queryWrapper.eq("type", orderType);
+        queryWrapper.between("demand_date", DateUtil.beginOfDay(demandDate), DateUtil.endOfDay(demandDate));
+        staffStopMealsDaoMapper.delete(queryWrapper);
+
+        // 查找是否已经订餐
         FtOrderDao dao = new FtOrderDao();
         dao.setStaffId(staffId);
         dao.setOrderType(orderType);
@@ -79,6 +87,14 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     @Override
     public AjaxResult stopOrder(Long staffId, Integer orderType, Date demandDate) {
+        // 先删除当天的订餐记录，再添加停餐记录
+        QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("staff_id",  staffId);
+        wrapper.eq("order_type", orderType);
+        wrapper.between("order_date", DateUtil.beginOfDay(demandDate), DateUtil.endOfDay(demandDate));
+        this.baseMapper.delete(wrapper);
+
+        // 添加停餐记录
         FtStaffStopMealsDao dao = new FtStaffStopMealsDao();
         dao.setStaffId(staffId);
         dao.setType(orderType);