From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 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 07199ac..d32578d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -38,9 +38,11 @@
 import com.google.gson.GsonBuilder;
 import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;
 import com.yeshi.fanli.dao.mybatis.help.HelpCenterMapper;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.jd.JDSearchResult;
 import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
 import com.yeshi.fanli.entity.dynamic.DynamicInfo;
 import com.yeshi.fanli.entity.dynamic.GoodsPicture;
 import com.yeshi.fanli.entity.dynamic.InviteMaterial;
@@ -59,6 +61,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;
@@ -66,6 +69,7 @@
 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;
@@ -124,6 +128,9 @@
 
 	@Resource
 	private IntegralGetService integralGetService;
+	
+	@Resource
+	private UserMoneyExtraService userMoneyExtraService;
 
 	@RequestMapping(value = "testimg")
 	public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -471,10 +478,12 @@
 				if (goodsList != null && goodsList.size() > 0) {
 					BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 					BigDecimal shareRate = hongBaoManageService.getShareRate();
+					ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+
 					Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 							.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 					for (JDGoods goods : goodsList) {
-						GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+						GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
 						array.add(gson.toJson(goodsDetailVO));
 					}
 				}
@@ -622,24 +631,31 @@
 		}
 	}
 
-	@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) {
-		// }
+	@RequestMapping("getLocalTime")
+	public void getLocalTime(PrintWriter out) {
+		out.print(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
+	}
 
+	@RequestMapping("getSchedulerList")
+	public void getSchedulerList(PrintWriter out) {
 		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();
+			for (String groupName : scheduler.getJobGroupNames()) {
+				System.out.println(groupName);
+			}
+		} catch (Exception e) {
 		}
 	}
 
+	@RequestMapping("taoLiJinExchange")
+	public void taoLiJinExchange(PrintWriter out) {
+		try {
+			for (int i = 1; i <= 100; i ++) {
+				userMoneyExtraService.taoLiJinExchange(i, 200);
+			}
+			JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.8.0