From 8eda088db63ff198cbcd51bf0599531ed006cb84 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 12:26:18 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 bcc6590..b10377b 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
@@ -99,7 +99,7 @@
shoppingGoods.setReferencePice(0D);
}
// 验证套餐卡卡必须填写最大使用次数
- if (Dictionary.FLAG_YES_Y.equals(shoppingGoods.getIsCourse())) {
+ if (Dictionary.FLAG_YES_Y.equals(shoppingGoods.getIsCourse()) && Dictionary.FLAG_NO_N.equals(shoppingGoods.getIsInfinite())) {
if (shoppingGoods.getCarUseCount() == null) {
shoppingGoods.setCarUseCount(0);
}
@@ -434,7 +434,11 @@
@Override
public Date calInvalidTime(ShoppingGoods shoppingGoods, @NotNull Integer type, Date buyDate) {
if (StringUtils.isBlank(shoppingGoods.getBuyValid()) && StringUtils.isBlank(shoppingGoods.getUseValid()) && shoppingGoods.getInvalidTime() == null) {
- return null;
+ return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
+ }
+
+ if (type == 2 && shoppingGoods.getUseDateNum() == null && StringUtils.isNotBlank(shoppingGoods.getBuyDateUnit())) {
+ return DateUtil.stringToDate("9999-12-31", DateUtil.DATE_FORMAT_DD);
}
if (type == 2 && buyDate == null) {
--
Gitblit v1.9.1