From 1386a8657ec42cd3baf6bde8b1506f52c910f0e1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Mar 2023 12:29:45 +0800
Subject: [PATCH] 20220516
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 45f6ee7..73b7c72 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
@@ -456,21 +456,25 @@
return DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);
}
- if (type == 2 && buyDate == null) {
- throw new GlobleException("购买日期不能为空");
- }
+// if (type == 2 && buyDate == null) {
+// throw new GlobleException("购买日期不能为空");
+// }
Date target = null;
- Date buyValidDate = null;
- if (type == 1 && StrUtil.isNotBlank(shoppingGoods.getBuyValid())) {
- buyValidDate = DateUtil.stringToDate(shoppingGoods.getBuyValid(), "yyyy-MM-dd");
+ Date buyValidDate = DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);;
+ if (type == 1) {
+ if (shoppingGoods.getBuyDateNum() != null && StrUtil.isNotBlank(shoppingGoods.getBuyDateUnit())) {
+ buyValidDate = DateUtil.calDate(shoppingGoods.getBuyDateNum(), shoppingGoods.getBuyDateUnit());
+ }
} else {
buyValidDate = buyDate;
}
Date useValidDate = DateUtil.stringToDate("2099-12-31", DateUtil.DATE_FORMAT_DD);
- if (type == 2 && StrUtil.isNotBlank(shoppingGoods.getUseValid())) {
- useValidDate = DateUtil.stringToDate(shoppingGoods.getUseValid(), "yyyy-MM-dd");
+ if (type == 2) {
+ if (shoppingGoods.getUseDateNum() != null && StrUtil.isNotBlank(shoppingGoods.getUseDateUnit())) {
+ useValidDate = DateUtil.calDate(shoppingGoods.getUseDateNum(), shoppingGoods.getUseDateUnit());
+ }
}
if (buyValidDate != null) {
--
Gitblit v1.9.1