From d6628194b6d867f840d37db2ef9dc057a2084270 Mon Sep 17 00:00:00 2001 From: 姜友瑶 <935090232@qq.com> Date: Fri, 01 Jul 2022 07:36:00 +0800 Subject: [PATCH] fix:修复用户绑定后被删除的情况 --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java index 193c1f5..43a1b81 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java @@ -278,8 +278,11 @@ LogUtil.info("扣减储值卡余额 {}", JSON.toJSONString(moneyCardOperationDto)); MoneyCardUse moneyCardUse = moneyCardUseDao.selectById(moneyCardOperationDto.getCarUseId()); - //欠款检查 - checkOrderStatu(moneyCardUse.getOrderItemId()); + // 用户默认储值卡不进行欠款检查 20220512 wzy + if (Dictionary.FLAG_NO_N.equals(moneyCardUse.getIsVipCar())) { + //欠款检查 + checkOrderStatu(moneyCardUse.getOrderItemId()); + } //赠送金额扣款 if (moneyCardUse.getGiftMoney() + moneyCardOperationDto.getGiftMoney() >= 0) { @@ -311,7 +314,11 @@ moneyCardUse.setFailTime(invalidTime); } - moneyCardUse.setLastCount(moneyCardUse.getLastCount() - moneyCardOperationDto.getCount()); + // 储值卡不减少使用次数 20220512 wzy + if (Dictionary.FLAG_NO_N.equals(moneyCardUse.getIsVipCar())) { + moneyCardUse.setLastCount(moneyCardUse.getLastCount() - moneyCardOperationDto.getCount()); + } + // 更新充值卡信息 moneyCardUseDao.update(moneyCardUse); //设置卡项使用流水 -- Gitblit v1.9.1