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 | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 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 776f331..10f86e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -60,6 +60,7 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.tag.PageEntity;
@@ -67,11 +68,11 @@
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.db.MongoDBManager;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.push.OPPOPushUtil;
-import com.yeshi.fanli.util.push.VIVOPushUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -125,6 +126,9 @@
@Resource
private IntegralGetService integralGetService;
+
+ @Resource
+ private UserMoneyExtraService userMoneyExtraService;
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -472,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();
@@ -548,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());
}
@@ -625,24 +629,9 @@
}
}
- @RequestMapping("pushVIVO")
- public void pushVIVO(PrintWriter out) {
- List<String> regList = new ArrayList<>();
- regList.add("15710270630271520610033");
- // regList.add("15711218630321520681531");
- // try {
- // VIVOPushUtil.pushUrl(regList, "鏍囬", "缃戦〉鍐呭", "http://www.baidu.com");
- // } catch (Exception e) {
- // }
-
- try {
- VIVOPushUtil.pushBaiChuanUrl(regList, "鏍囬", "鐧惧窛鍐呭", "http://www.taobao.com");// 鏈塨ug
- // VIVOPushUtil.pushGoods(regList, "鏍囬", "鍟嗗搧鍐呭", 2, 100005625634L);
- // VIVOPushUtil.pushUserSignInNotification(regList, "鏍囬", "绛惧埌");
- // VIVOPushUtil.pushWelfareCenter(regList,"鏍囬", "绂忓埄涓績");
- } catch (PushException e) {
- e.printStackTrace();
- }
+ @RequestMapping("getLocalTime")
+ public void getLocalTime(PrintWriter out) {
+ out.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
}
@RequestMapping("getSchedulerList")
@@ -654,5 +643,4 @@
} catch (Exception e) {
}
}
-
}
--
Gitblit v1.8.0