From 3e035fe70affb29722e919f3577bb8d3bbdb77d8 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Wed, 3 Feb 2021 17:14:46 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E4=BF=AE=E5=A4=8D=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E8=AE=A2=E9=A4=90=E6=97=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BD=99=E9=A2=9D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fantang/controller/ClientController.java    |  5 +++++
 .../fantang/controller/FtSettleDaoController.java      | 10 ++++++----
 ruoyi-ui/src/views/fantang/settle/index.vue            |  2 +-
 3 files changed, 12 insertions(+), 5 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 235d451f8..ac15b40f4 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
@@ -466,12 +466,14 @@ public class ClientController extends BaseController {
             // 更新员工账户补贴余额
             BigDecimal nowBalance = balance.subtract(totalPrice);
             staffInfoDao.setBalance(nowBalance);
+            staffInfoDaoService.updateById(staffInfoDao);
 
             orderDaoService.save(orderDao);
 
             // 添加补贴流水记录
             FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao();
             staffSubsidyDao.setStaffId(orderDao.getStaffId());
+            staffSubsidyDao.setSubsidyType("餐费补贴");
             staffSubsidyDao.setIncomeType(2);
             staffSubsidyDao.setPrice(totalPrice);
             staffSubsidyDao.setConsumAt(today);
@@ -495,6 +497,9 @@ public class ClientController extends BaseController {
 
         // 当前订单信息
         FtOrderDao orderDao = orderDaoService.getById(orderId);
+        if (orderDao == null) {
+            AjaxResult.error("无效订单");
+        }
         // 更新订单信息
         orderDao.setPayFlag(2);
         orderDaoService.save(orderDao);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
index e36aa32e2..505f9b7b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -68,12 +69,13 @@ public class FtSettleDaoController extends BaseController {
 
         // 根据病人 id ，上次结算日期，选择日期查询病人非营养餐记录
         QueryWrapper<FtReportMealsDao> reportMealsWrapper = new QueryWrapper<>();
-        reportMealsWrapper.eq("patient_id", patientId);
-        reportMealsWrapper.eq("dining_flag",1);
-        reportMealsWrapper.between("dining_at", sdf.format(lastBillingDate), sdf.format(selectBillingDate));
+        reportMealsWrapper
+                .eq("patient_id", patientId)
+                .eq("dining_flag",1)
+                .between("dining_at", sdf.format(lastBillingDate), DateUtil.endOfDay(selectBillingDate));
         List<FtReportMealsDao> reportMealsList = iFtReportMealsDaoService.list(reportMealsWrapper);
 
-        ReportMealsPriceEntity reportMealsPrice = iFtReportMealsDaoService.sumTotalPrice(patientId, lastBillingDate, selectBillingDate);
+        ReportMealsPriceEntity reportMealsPrice = iFtReportMealsDaoService.sumTotalPrice(patientId, DateUtil.beginOfDay(lastBillingDate), DateUtil.endOfDay(selectBillingDate));
 
         Map<String, Object> data = new HashMap<>(2);
         data.put("reportMealsList", reportMealsList);
diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue
index 2f050a8e5..42c44dd0e 100644
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@@ -306,7 +306,7 @@ import {
   showAllMealsWithNoPay,
   showMealsWithSelect
 } from "../../../api/fantang/settle";
-import {getLastSettlementDate, listAll, listMealsWithInSettle, listNoPay, listPayoff} from "@/api/fantang/meals";
+import {getLastSettlementDate, listAll, listMealsWithInSettle, listNoPay, listPayoff} from "../../../api/fantang/meals";
 import {getUserProfile} from "@/api/system/user";
 import {listDepart} from "@/api/fantang/depart";