From 0704a2a51ca1c157cccbb57c42e4cdfa33808c55 Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Fri, 25 Dec 2020 14:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A5=E5=B8=B8?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fantang/controller/FtReportMealsDaoController.java | 1 + .../system/fantang/controller/FtSettleDaoController.java | 8 ++++---- ruoyi-ui/src/views/fantang/settle/index.vue | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java index 0a544365c..57cd886a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java @@ -46,6 +46,7 @@ public class FtReportMealsDaoController extends BaseController { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("patient_id", patientId); + wrapper.eq("settlement_flag", 1); wrapper.orderByDesc("settlement_at"); wrapper.last("limit 1"); FtReportMealsDao ftReportMealsDao = iFtReportMealsDaoService.getOne(wrapper); 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 076ef0ffa..34db7a6fd 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 @@ -114,10 +114,10 @@ public class FtSettleDaoController extends BaseController { FtPrepaymentDao prepaymentDao = iFtPrepaymentDaoService.getOne(prepaymentWrapper); // 预付费扣费 - BigDecimal prepaid = prepaymentDao.getPrepaid(); - BigDecimal balance = prepaid.subtract(netPeceipt); - prepaymentDao.setPrepaid(balance); - iFtPrepaymentDaoService.updateById(prepaymentDao); +// BigDecimal prepaid = prepaymentDao.getPrepaid(); +// BigDecimal balance = prepaid.subtract(netPeceipt); +// prepaymentDao.setPrepaid(balance); +// iFtPrepaymentDaoService.updateById(prepaymentDao); // 添加结算记录 FtSettleDao ftSettleDao = new FtSettleDao(); diff --git a/ruoyi-ui/src/views/fantang/settle/index.vue b/ruoyi-ui/src/views/fantang/settle/index.vue index f340c28ef..321b826da 100644 --- a/ruoyi-ui/src/views/fantang/settle/index.vue +++ b/ruoyi-ui/src/views/fantang/settle/index.vue @@ -204,7 +204,7 @@ - +