From cbad97fdf8ec5607ca0c2ae898cd4e0657e056a1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 18 Dec 2020 16:28:10 +0800
Subject: [PATCH] finish vip.html
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 23c1e7e..438b430 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -629,6 +629,10 @@
moneyCardUse.setIsOver(Dictionary.FLAG_YES_Y);
moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_WX);
}
+
+ ShoppingGoods shoppingGoods = shoppingGoodsService.findById(moneyCardUse.getGoodsId());
+ Date invalidTime = shoppingGoodsService.calInvalidTime(shoppingGoods, 2, moneyCardUse.getFailTime());
+ moneyCardUse.setFailTime(invalidTime);
// 更新充值卡信息
moneyCardUseDao.update(moneyCardUse);
}
@@ -736,14 +740,17 @@
moneyCardUse.setLastCount(moneyCar.getCarUseCount());
}
moneyCardUse.setVipId(sourceOrder.getVipId());
- if (moneyCar.getValidity() == null || moneyCar.getValidity() == 0) {
- // 设置失效时间
- Calendar cal = Calendar.getInstance();
- cal.set(2200, 1, 1);
- moneyCardUse.setFailTime(cal.getTime());
- } else {
- moneyCardUse.setFailTime(DateUtil.nextNDate(new Date(), 30 * moneyCar.getValidity()));
- }
+// if (moneyCar.getValidity() == null || moneyCar.getValidity() == 0) {
+// // 设置失效时间
+// Calendar cal = Calendar.getInstance();
+// cal.set(2200, 1, 1);
+// moneyCardUse.setFailTime(cal.getTime());
+// } else {
+// moneyCardUse.setFailTime(DateUtil.nextNDate(new Date(), 30 * moneyCar.getValidity()));
+// }
+ Date invalidTime = shoppingGoodsService.calInvalidTime(sysOrderItem.getShoppingGoods(), 1, null);
+ moneyCardUse.setFailTime(invalidTime);
+
moneyCardUseDao.insert(moneyCardUse);
}
}
--
Gitblit v1.9.1