From 3aef471b170a703b501ddb4d9d2a12791d07ff28 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:06:56 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/PricingRuleService.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java b/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
index 20dcb95..d4d6419 100644
--- a/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
+++ b/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
@@ -14,6 +14,7 @@
import com.doumee.dao.vo.StoreDepositVO;
import com.doumee.dao.vo.RevenueShareVO;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -133,30 +134,26 @@
List<RemoteDeliveryPricingVO> listRemoteDeliveryPricing(Integer cityId);
/**
- * 鏂板棰勮鏃舵晥閰嶇疆
- * @param request 淇濆瓨璇锋眰
- * @return 瑙勫垯涓婚敭
- */
- Integer createEstimatedDelivery(EstimatedDeliverySaveDTO request);
-
- /**
- * 淇敼棰勮鏃舵晥閰嶇疆
+ * 淇濆瓨棰勮鏃舵晥閰嶇疆(鏍囬�熻揪fieldA=1 + 鏋侀�熻揪fieldA=2锛屾湁鍒欐洿鏂版棤鍒欐柊澧�)
* @param request 淇濆瓨璇锋眰
*/
- void updateEstimatedDelivery(EstimatedDeliverySaveDTO request);
+ void saveEstimatedDelivery(EstimatedDeliverySaveDTO request);
/**
- * 鍒犻櫎棰勮鏃舵晥閰嶇疆
- * @param id 瑙勫垯涓婚敭
- */
- void deleteEstimatedDelivery(Integer id);
-
- /**
- * 鏌ヨ棰勮鏃舵晥閰嶇疆鍒楄〃
+ * 鏌ヨ棰勮鏃舵晥閰嶇疆鍒楄〃(鏍囬�熻揪fieldA=1 + 鏋侀�熻揪fieldA=2)
* @param cityId 鍩庡競涓婚敭
* @return 棰勮鏃舵晥閰嶇疆鍒楄〃
*/
- List<EstimatedDeliveryVO> listEstimatedDelivery(Integer cityId);
+ List<EstimatedDeliveryVO> getEstimatedDelivery(Integer cityId);
+
+ /**
+ * 鏍规嵁鍩庡競銆佺被鍨嬨�佽窛绂昏绠楅璁℃椂鏁堟椂闀�
+ * @param cityId 鍩庡競涓婚敭
+ * @param fieldA 绫诲瀷锛�1=鏍囬�熻揪锛�2=鏋侀�熻揪
+ * @param distance 璺濈锛堝叕閲岋級
+ * @return 棰勮鏃堕暱锛堝皬鏃讹級锛屾湭鎵惧埌閰嶇疆杩斿洖null
+ */
+ BigDecimal calculateEstimatedTime(Integer cityId, Integer fieldA, BigDecimal distance);
/**
* 鎵归噺淇濆瓨闂ㄥ簵娉ㄥ唽鎶奸噾
--
Gitblit v1.9.3