From 4a2d0d30b1993fa4b3fdd943c93e327124c6cff7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 13:05:33 +0800
Subject: [PATCH] 测试controller修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 2e3f5ad..10f86e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -126,7 +126,7 @@
 
 	@Resource
 	private IntegralGetService integralGetService;
-	
+
 	@Resource
 	private UserMoneyExtraService userMoneyExtraService;
 
@@ -476,7 +476,7 @@
 				if (goodsList != null && goodsList.size() > 0) {
 					BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 					BigDecimal shareRate = hongBaoManageService.getShareRate();
-					ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+					ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
 
 					Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 							.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -552,7 +552,7 @@
 			for (Iterator<String> its = sets.iterator(); its.hasNext();)
 				array.add(its.next());
 		} finally {
-			jedisPool.returnResource(jedis);
+			jedis.close();
 		}
 		out.println(array.toString());
 	}

--
Gitblit v1.8.0