From 8c54d1580eea83ec99b443ed853b73d3ce509358 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 21 May 2024 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB=E6=96=B0=E5=A2=9E=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataPriceServiceImpl.java       | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index 5dd410828..961c150ed 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -208,6 +208,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) {
 			throw new ServiceException("生效时间大于到期时间，请检查。");
 		}
+		// 只能维护当前时间的版本，时间范围必须包含当前时间
 		Long clientId1 = vo.getClientId();
 		Long brandId1 = vo.getBrandId();
 		List<BasicdataPriceEntity> list1 = this.list(Wrappers.<BasicdataPriceEntity>lambdaQuery()
@@ -215,6 +216,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			.eq(BasicdataPriceEntity::getBrandId, brandId1)
 			.eq(BasicdataPriceEntity::getIsDeleted, 0)
 		);
+
 		// 修改的当前版本时间控制
 		Date start1 = vo.getEffectiveTime();
 		Date end1 = vo.getExpiryTime();
@@ -245,22 +247,44 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		BasicdataPriceEntity entity = null;
 		if (ObjectUtil.isNotEmpty(vo.getId())) {
 			entity = this.getById(vo.getId());
-			if (ObjectUtil.isNotEmpty(entity)) {
-				Long templateId = entity.getTemplateId();
-				if (!ObjectUtil.equal(templateId, vo.getTemplateId())) {
-					// 删除数据
-					deleteByPriceId(vo.getId());
-					entity.setDispatchStairsCarryingCharge(0);
-					entity.setDispatchUpwardJudgment(0d);
-					entity.setDispatchUpwardJudgmentCost(0d);
-					log.info("价格体系：{} 切换模版删除数据", vo.getId());
-				}
+		} else {
+			if (flag > 0) {
+				throw new ServiceException("生效时间与截止时间范围在系统中已存在，请确认");
+			}
+		}
+		if (ObjectUtil.isNotEmpty(entity)) {
+			Long templateId = entity.getTemplateId();
+			if (!ObjectUtil.equal(templateId, vo.getTemplateId())) {
+				// 删除数据
+				deleteByPriceId(vo.getId());
+				entity.setDispatchStairsCarryingCharge(0);
+				entity.setDispatchUpwardJudgment(0d);
+				entity.setDispatchUpwardJudgmentCost(0d);
+				log.info("价格体系：{} 切换模版删除数据", vo.getId());
 			}
 		} else {
 			entity = new BasicdataPriceEntity();
 			entity.setClientId(vo.getClientId());
 			entity.setBrandId(vo.getBrandId());
 		}
+//		if (ObjectUtil.isNotEmpty(vo.getId())) {
+//			entity = this.getById(vo.getId());
+//			if (ObjectUtil.isNotEmpty(entity)) {
+//				Long templateId = entity.getTemplateId();
+//				if (!ObjectUtil.equal(templateId, vo.getTemplateId())) {
+//					// 删除数据
+//					deleteByPriceId(vo.getId());
+//					entity.setDispatchStairsCarryingCharge(0);
+//					entity.setDispatchUpwardJudgment(0d);
+//					entity.setDispatchUpwardJudgmentCost(0d);
+//					log.info("价格体系：{} 切换模版删除数据", vo.getId());
+//				}
+//			}
+//		} else {
+//			entity = new BasicdataPriceEntity();
+//			entity.setClientId(vo.getClientId());
+//			entity.setBrandId(vo.getBrandId());
+//		}
 		entity.setTemplateId(vo.getTemplateId());
 		entity.setEffectiveTime(vo.getEffectiveTime());
 		entity.setExpiryTime(vo.getExpiryTime());