From dd934b9c655d085687747b0bb78209d45c1d1d9e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Dec 2020 17:43:34 +0800
Subject: [PATCH] modify goods invalid time function
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index dc8cba5..c89bc78 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -125,19 +125,31 @@
private void setShoppingGoodsInvalidTime(ShoppingGoods shoppingGoods) {
// 若未设置购买有效期和消耗有效期，则默认永久有效
- if (shoppingGoods.getBuyDateNum() == null && shoppingGoods.getUseDateNum() == null) {
- shoppingGoods.setInvalidTime(DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD));
- } else {
- // 计算失效日期，判断购买有效期和消耗有效期哪个先失效，则为失效日期
- Date buyValidDate = DateUtil.calDate(shoppingGoods.getBuyDateNum(), shoppingGoods.getBuyDateUnit());
- Date useValidDate = DateUtil.calDate(shoppingGoods.getUseDateNum(), shoppingGoods.getUseDateUnit());
- if (buyValidDate.after(useValidDate)) {
- shoppingGoods.setInvalidTime(useValidDate);
- } else {
- shoppingGoods.setInvalidTime(buyValidDate);
- }
+// if (shoppingGoods.getBuyDateNum() == null && shoppingGoods.getUseDateNum() == null) {
+// shoppingGoods.setInvalidTime(DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD));
+// } else {
+// // 计算失效日期，判断购买有效期和消耗有效期哪个先失效，则为失效日期
+// Date buyValidDate = DateUtil.calDate(shoppingGoods.getBuyDateNum(), shoppingGoods.getBuyDateUnit());
+// Date useValidDate = DateUtil.calDate(shoppingGoods.getUseDateNum(), shoppingGoods.getUseDateUnit());
+// if (buyValidDate.after(useValidDate)) {
+// shoppingGoods.setInvalidTime(useValidDate);
+// } else {
+// shoppingGoods.setInvalidTime(buyValidDate);
+// }
+// shoppingGoods.setBuyValid(shoppingGoods.getBuyDateNum() + shoppingGoods.getBuyDateUnit());
+// shoppingGoods.setUseValid(shoppingGoods.getUseDateNum() + shoppingGoods.getUseDateUnit());
+// }
+
+ if (shoppingGoods.getBuyDateNum() != null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
shoppingGoods.setBuyValid(shoppingGoods.getBuyDateNum() + shoppingGoods.getBuyDateUnit());
+ } else {
+ shoppingGoods.setBuyValid(null);
+ }
+
+ if (shoppingGoods.getUseDateNum() != null && StringUtils.isNotBlank(shoppingGoods.getUseDateUnit())) {
shoppingGoods.setUseValid(shoppingGoods.getUseDateNum() + shoppingGoods.getUseDateUnit());
+ } else {
+ shoppingGoods.setUseValid(null);
}
}
--
Gitblit v1.9.1