feat(all): 增加价格删除待生效的数据

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);
+	}
 
 	/**
 	 * 基础价格表 导入

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);
 }

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) {