From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/config/HongBaoManageService.java |    4 ++++
 1 files changed, 4 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 b243574..d374f4f 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
@@ -18,6 +18,8 @@
 	public String get(String key);
 
 	public BigDecimal getByKeyAndMaxTime(String key, Long time);
+	
+	public BigDecimal getByKeyAndMaxTimeCache(String key, Long time);
 
 	public Map<String, String> convertMap();
 
@@ -172,5 +174,7 @@
 	 * @return
 	 */
 	public BigDecimal getBaseFanliRate();
+	
+	public BigDecimal getBaseFanliRateCache(long time);
 
 }

--
Gitblit v1.8.0