From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java | 61 ++----------------------------
1 files changed, 4 insertions(+), 57 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 4b91861..414e544 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
@@ -42,6 +42,10 @@
@Autowired
private SysVipLevelDao viplevelDao;
+
+
+
+
@Override
public int add(MoneyCardUse moneyCardUse) {
@@ -213,64 +217,7 @@
}
}
- //退款
- @Override
- public int returnMoney(MoneyCardUse moneyCardUse, Long hjkId) {
-
- MoneyCardUse realObj = moneyCardUseDao.selectById(moneyCardUse.getId());
-
- //检测商品是否已付款完成
- if (realObj.getOrderItemId() != 1) {//不是数据迁移过来的判断付款状态
- checkOrderStatu(realObj.getOrderItemId());
- }
-
- if (!realObj.getStatus().equals(Dictionary.TAOCAN_STATUS_YX)) {
- throw new GlobleException("不是有效充值卡");
- }
-
- if (realObj.getSource().contains(Dictionary.TAOCAN_SOURCE_ZR)) {
- throw new GlobleException("转让的充值卡不能退款");
- }
- if (realObj.getSource().contains(Dictionary.TAOCAN_SOURCE_ZS)) {
- throw new GlobleException("赠送的充值卡不能退款");
- }
-
- if (Dictionary.FLAG_YES_Y.equals(realObj.getIsVipCar())) {
- //更新会员等级
- realObj.getVipInfo().setLevelId(0L);
- infoDao.update(realObj.getVipInfo());
- }
- StringBuilder content = new StringBuilder();
-
- //有会籍卡退到会籍卡中，无则退了现金
- if (hjkId != null && !hjkId.equals("")) {
- MoneyCardUse vipCard = moneyCardUseDao.selectById(hjkId);
- vipCard.setRealMoney(vipCard.getRealMoney() + realObj.getRealMoney());
- moneyCardUseDao.update(vipCard);
- content.append(realObj.getCardName() + "退款￥" + realObj.getRealMoney() + "到会籍卡")
- .append(vipCard.getCardName())
- .append(",余次:" + vipCard.getLastCountName())
- .append(",本金余额:" + vipCard.getRealMoney())
- .append(",有效期:" + DateUtil.dateToString(vipCard.getFailTime(), DateUtil.DATE_FORMAT_MM))
- .append(",是否赠送:" + vipCard.getSourceName());
- } else {
- content.append(realObj.getCardName() + "退款现金￥" + moneyCardUse.getReturnMonery() + "");
- }
- DecimalFormat df = new DecimalFormat("#.00");
- double d = Double.valueOf(df.format(realObj.getRealMoney() - Double.valueOf(moneyCardUse.getReturnMonery())));
- //退款的本金为零，状态为已退款
- realObj.setRealMoney(d);
- //赠送金额也清零
- realObj.setGiftMoney(0.0);
- if (d <= 0) {
- realObj.setStatus(Dictionary.TAOCAN_STATUS_TK);
- }
- int i = moneyCardUseDao.update(realObj);
- SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- //新增退款流水
- return i;
- }
//设置为有效
@Override
--
Gitblit v1.9.1