From 8b2b7585337f5eb4334ea27a6b5dc55612e66a6e Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 21 May 2024 17:21:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=88=A0=E9=99=A4=E5=BE=85=E7=94=9F=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BasicdataPriceController.java      |  8 ++++++++
 .../basicdata/service/IBasicdataPriceService.java |  6 ++++++
 .../service/impl/BasicdataPriceServiceImpl.java   | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
index 76fd23e51..1839d7e0c 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java
@@ -45,6 +45,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -132,6 +133,13 @@ public class BasicdataPriceController extends BladeController {
 		Boolean res = basicdataPriceService.updatePrice(vo);
 		return R.status(res);
 	}
+	@DeleteMapping("{id}")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "删除待生效的价格", notes = "删除待生效的价格")
+	public R<Boolean> deletePrice(@PathVariable("id") String id) {
+		Boolean res = basicdataPriceService.deletePrice(id);
+		return R.status(res);
+	}
 
 	/**
 	 * 基础价格表 导入
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
index f99c5cbb2..904e2e9b8 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java
@@ -74,4 +74,10 @@ public interface IBasicdataPriceService extends BaseService<BasicdataPriceEntity
 
 	IPage<BasicdataPricePageVO> hisPage(IPage<BasicdataPricePageVO> page, BasicdataPricePageVO basicdataPrice);
 
+	/**
+	 * 删除待生效的价格
+	 * @param id
+	 * @return
+	 */
+	Boolean deletePrice(String id);
 }
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 026cf0389..f8111857b 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
@@ -213,6 +213,21 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		return page.setRecords(basicdataPriceVOS);
 	}
 
+	@Override
+	public Boolean deletePrice(String id) {
+		BasicdataPriceEntity entity = this.getById(id);
+		if (ObjectUtil.isNotEmpty(entity)) {
+			if (new Date().before(entity.getEffectiveTime())) {
+				this.removeById(id);
+				return Boolean.TRUE;
+			} else {
+				throw new ServiceException("只能删除待生效的数据");
+			}
+		} else {
+			throw new ServiceException("价格不存在，删除失败");
+		}
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) {