From 647bb9d69d46800f7e57c963628ddd1956866c1a Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Wed, 13 Jan 2021 16:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E6=A0=B8=E9=94=80=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fantang/common/DinnerTypeUtils.java       | 33 +++++++++++++++----
 .../controller/FtConfigDaoController.java     | 15 +++------
 .../service/impl/FtOrderDaoServiceImpl.java   |  9 +++--
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java
index 37c51a3fa..6ed821931 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/common/DinnerTypeUtils.java
@@ -23,17 +23,38 @@ public class DinnerTypeUtils {
         }
         return instance;
     }
+    
+    public void updateDinnerTypeUtils(String settings){
+        String[] setting = settings.split(",");
+        if (setting.length != 6) {
+            return;
+        }
+        String today = DateUtil.today();
+        this.breakfastStart = DateUtil.parse(today + " " + setting[0]);
+        this.breakfastEnd = DateUtil.parse(today + " " + setting[1]);
 
-    private final Date breakfastStart;
-    private final Date breakfastEnd;
+        this.lunchStart = DateUtil.parse(today + " " + setting[2]);
+        this.lunchEnd = DateUtil.parse(today + " " + setting[3]);
 
-    private final Date lunchStart;
-    private final Date lunchEnd;
+        this.dinnerStart = DateUtil.parse(today + " " + setting[4]);
+        this.dinnerEnd = DateUtil.parse(today + " " + setting[5]);
 
-    private final Date dinnerStart;
-    private final Date dinnerEnd;
+    }
+
+    private Date breakfastStart;
+    private Date breakfastEnd;
+
+    private Date lunchStart;
+    private Date lunchEnd;
+
+    private Date dinnerStart;
+    private Date dinnerEnd;
 
 
+    /**
+     * 初始化用餐类型判断基础类，加载用餐时间参数
+     * @param configDaoService
+     */
     private DinnerTypeUtils(IFtConfigDaoService configDaoService) {
 
         Map<String, String> setting = configDaoService.getDinnerTimeSetting();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java
index f9ad20eb0..379e9396a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtConfigDaoController.java
@@ -12,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.fantang.common.DinnerTypeUtils;
 import com.ruoyi.system.fantang.domain.FtConfigDao;
 import com.ruoyi.system.fantang.service.IFtConfigDaoService;
 import lombok.RequiredArgsConstructor;
@@ -20,9 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 饭堂参数Controller
@@ -116,10 +115,8 @@ public class FtConfigDaoController extends BaseController {
     @PostMapping("/updateDinnerTime")
     public AjaxResult updateDinnerTime(@RequestBody JSONObject params) {
 
-
         StringBuilder configValue = new StringBuilder();
 
-
         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
         JSONArray breakfastJson = params.getJSONArray("breakfast");
         JSONArray lunchJson = params.getJSONArray("lunch");
@@ -149,12 +146,10 @@ public class FtConfigDaoController extends BaseController {
             }
         }
 
-        UpdateWrapper<FtConfigDao> wrapper = new UpdateWrapper<>();
-        wrapper.eq("id", params.getLong("id"));
-        FtConfigDao ftConfigDao = new FtConfigDao();
-        ftConfigDao.setConfigValue(configValue.toString());
+        iFtConfigDaoService.updateConfigValue(params.getLong("id"),configValue.toString());
+
+        DinnerTypeUtils.getInstance(iFtConfigDaoService).updateDinnerTypeUtils(configValue.toString());
 
-        iFtConfigDaoService.update(ftConfigDao, wrapper);
         return AjaxResult.success("已修改");
     }
 
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 4eb0f0cad..6e1229172 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
@@ -58,6 +58,7 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
         dao.setStaffId(staffId);
         dao.setOrderType(orderType);
         dao.setOrderDate(demandDate);
+        dao.setCreateAt(new Date());
         QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
         wrapper.eq("staff_id", staffId);
         wrapper.eq("order_type", orderType);
@@ -108,9 +109,11 @@ public class FtOrderDaoServiceImpl extends ServiceImpl<FtOrderDaoMapper, FtOrder
 
     @Override
     public AjaxResult cancelOrder(Long orderId) {
-        FtOrderDao dao = new FtOrderDao();
-        dao.setOrderId(orderId);
-        return AjaxResult.success(this.baseMapper.deleteById(dao));
+        QueryWrapper<FtOrderDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id",orderId);
+        wrapper.eq("write_off_flag", 0);
+
+        return AjaxResult.success(this.baseMapper.delete(wrapper));
     }
 
     @Override