From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 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 86b8bb9..776f331 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -38,6 +38,7 @@
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;
@@ -70,6 +71,7 @@
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;
@@ -120,10 +122,9 @@
@Resource
private JedisPool jedisPool;
-
+
@Resource
private IntegralGetService integralGetService;
-
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -471,10 +472,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));
}
}
@@ -583,29 +586,28 @@
}
out.print("success");
- }
+ }
@RequestMapping(value = "testListTLJGoods")
- public void getGoodsList(String callback,PrintWriter out) {
+ public void getGoodsList(String callback, PrintWriter out) {
SearchFilter sf = new SearchFilter();
sf.setQuan(1);
sf.setTmall(true);
-// sf.setEndPrice(new BigDecimal(1000));
+ // sf.setEndPrice(new BigDecimal(1000));
sf.setPage(1);
sf.setPage(100);
sf.setCateIds("16");
sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
-
+
TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
Gson gson = new Gson();
- JSONArray array=new JSONArray();
+ JSONArray array = new JSONArray();
for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
}
-
/**
* 鎻掑叆閭�璇风礌鏉�
*
@@ -622,5 +624,35 @@
e.printStackTrace();
}
}
-
+
+ @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("getSchedulerList")
+ public void getSchedulerList(PrintWriter out) {
+ try {
+ for (String groupName : scheduler.getJobGroupNames()) {
+ System.out.println(groupName);
+ }
+ } catch (Exception e) {
+ }
+ }
+
}
--
Gitblit v1.8.0