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 | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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..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,10 +69,12 @@
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;
@@ -120,10 +125,12 @@
@Resource
private JedisPool jedisPool;
-
+
@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));
}
}
@@ -583,29 +592,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 +630,32 @@
e.printStackTrace();
}
}
-
+
+ @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 {
+ 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