From 1e6dea77a44506bd3ce9f8022839058a7089d783 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Dec 2020 17:34:47 +0800 Subject: [PATCH] fix service order (rx taocan) and open order bugs --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 12 +++++++++++- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java index a32253b..66cf4ed 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java @@ -167,7 +167,7 @@ taocan.setStatus(Dictionary.TAOCAN_STATUS_WX); } else if (Dictionary.FLAG_YES_Y.equals(taocan.getIsCourse())) { //任选套餐检查套餐整体剩余次数 - int tcSurplusCount = taocan.getSurplusCount() - sysProjUse.getDeductionNum(); + int tcSurplusCount = taocan.getSurplusCount() - sysBeauticianState.getCount(); if (tcSurplusCount < 0) { throw new GlobleException(taocan.getProjName() + "已经达到最大使用次数"); } else { @@ -492,6 +492,16 @@ upProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX); if (sysProjUse.getTaocanId() != null) { //TODO 更新套餐状态为有效 + SysProjUse taocanProjUse = sysProjUseDao.selectById(sysProjUse.getTaocanId()); + if (taocanProjUse.getSurplusCount() == 0) { + taocanProjUse.setIsOver(Dictionary.DELETED_N); + taocanProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX); + } + + if (Dictionary.FLAG_YES_Y.equals(taocanProjUse.getIsCourse())) { + taocanProjUse.setSurplusCount(taocanProjUse.getSurplusCount() + beauticianState.getCount()); + } + sysProjUseDao.update(taocanProjUse); } } int surplus = sysProjUse.getSurplusCount() + beauticianState.getCount(); diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html index b1890a5..b2497b0 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html @@ -888,9 +888,9 @@ */ chouseGoods() { let _this = this; - this.multipleSelection.forEach(item => { - _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE); - }); + // this.multipleSelection.forEach(item => { + // _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE); + // }); this.closeXm(); this.calculationTotal(); }, -- Gitblit v1.9.1