From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java
index ef56f3f..b2ffefe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java
@@ -17,6 +17,8 @@
 	public void update(List<HongBaoManage> hongBaoManageList);
 
 	public String get(String key);
+	
+	public BigDecimal getByKeyAndMaxTime(String key, Long time);
 
 	public Map<String, String> convertMap();
 
@@ -188,4 +190,19 @@
 	 */
 	public ConfigParamsDTO getShowComputeRate(String platform, String version);
 
+	/**
+	 * 鑾峰彇鍩虹鐨勮繑鍒╂瘮渚�
+	 * 
+	 * @param time
+	 * @return
+	 */
+	public BigDecimal getBaseFanliRate(long time);
+
+	/**
+	 * 鑾峰彇鍩虹鐨勮繑鍒╂瘮渚�
+	 * 
+	 * @return
+	 */
+	public BigDecimal getBaseFanliRate();
+
 }

--
Gitblit v1.8.0