abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug:修复员工余额订餐时更新余额信息

Browse Source
This commit is contained in:
czx 2021-02-03 17:14:46 +08:00
parent 7a253f1628
commit 3e035fe70a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
View File

@ -466,12 +466,14 @@ public class ClientController extends BaseController {
// 更新员工账户补贴余额 // 更新员工账户补贴余额
BigDecimal nowBalance = balance.subtract(totalPrice); BigDecimal nowBalance = balance.subtract(totalPrice);
staffInfoDao.setBalance(nowBalance); staffInfoDao.setBalance(nowBalance);
staffInfoDaoService.updateById(staffInfoDao);
orderDaoService.save(orderDao); orderDaoService.save(orderDao);
// 添加补贴流水记录 // 添加补贴流水记录
FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao(); FtStaffSubsidyDao staffSubsidyDao = new FtStaffSubsidyDao();
staffSubsidyDao.setStaffId(orderDao.getStaffId()); staffSubsidyDao.setStaffId(orderDao.getStaffId());
staffSubsidyDao.setSubsidyType("餐费补贴");
staffSubsidyDao.setIncomeType(2); staffSubsidyDao.setIncomeType(2);
staffSubsidyDao.setPrice(totalPrice); staffSubsidyDao.setPrice(totalPrice);
staffSubsidyDao.setConsumAt(today); staffSubsidyDao.setConsumAt(today);
@ -495,6 +497,9 @@ public class ClientController extends BaseController {
// 当前订单信息 // 当前订单信息
FtOrderDao orderDao = orderDaoService.getById(orderId); FtOrderDao orderDao = orderDaoService.getById(orderId);
if (orderDao == null) {
AjaxResult.error("无效订单");
}
// 更新订单信息 // 更新订单信息
orderDao.setPayFlag(2); orderDao.setPayFlag(2);
orderDaoService.save(orderDao); orderDaoService.save(orderDao);

10
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.fantang.controller; 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -68,12 +69,13 @@ public class FtSettleDaoController extends BaseController {
// 根据病人 id ，上次结算日期，选择日期查询病人非营养餐记录 // 根据病人 id ，上次结算日期，选择日期查询病人非营养餐记录
QueryWrapper<FtReportMealsDao> reportMealsWrapper = new QueryWrapper<>(); QueryWrapper<FtReportMealsDao> reportMealsWrapper = new QueryWrapper<>();
reportMealsWrapper.eq("patient_id", patientId); reportMealsWrapper
reportMealsWrapper.eq("dining_flag",1); .eq("patient_id", patientId)
reportMealsWrapper.between("dining_at", sdf.format(lastBillingDate), sdf.format(selectBillingDate)); .eq("dining_flag",1)
.between("dining_at", sdf.format(lastBillingDate), DateUtil.endOfDay(selectBillingDate));
List<FtReportMealsDao> reportMealsList = iFtReportMealsDaoService.list(reportMealsWrapper); 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); Map<String, Object> data = new HashMap<>(2);
data.put("reportMealsList", reportMealsList); data.put("reportMealsList", reportMealsList);

2
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -306,7 +306,7 @@ import {
showAllMealsWithNoPay, showAllMealsWithNoPay,
showMealsWithSelect showMealsWithSelect
} from "../../../api/fantang/settle"; } 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 {getUserProfile} from "@/api/system/user";
import {listDepart} from "@/api/fantang/depart"; import {listDepart} from "@/api/fantang/depart";