From 60da6176964cb65963bd15e8a00772cc33efbf1a Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 07 Oct 2022 16:04:32 +0800
Subject: [PATCH] 修改退款时无法退款到储值卡的bug
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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..eb061f6 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
@@ -202,7 +202,7 @@
moneyCardPayOrder(moneyCardOperationDto);
} else if (MoneyCardUseFlow.USE_TYPE_ORDRE_CANCEL.equals(moneyCardOperationDto.getType())) {
//回退储值卡余额
- GroupValidateStatusCheckUtil.check(moneyCardOperationDto,MoneyCardUseGroup.moneyCardUseOrderChange.class);
+ GroupValidateStatusCheckUtil.check(moneyCardOperationDto,MoneyCardUseGroup.moneyCardUseTk.class);
returnMoneyCard(moneyCardOperationDto);
} else if (MoneyCardUseFlow.USE_TYPE_CZ.equals(moneyCardOperationDto.getType())) {
//回退储值卡余额
@@ -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