From 99cc330a25cf85d8e25b2d1aeeb7ed468002255a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 十一月 2019 15:16:46 +0800
Subject: [PATCH] 用户信息返回等级，分享评论区文字修改
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 a5fa389..baa7db8 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;
@@ -60,15 +61,18 @@
import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
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;
@@ -119,6 +123,9 @@
@Resource
private JedisPool jedisPool;
+
+ @Resource
+ private IntegralGetService integralGetService;
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -466,10 +473,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));
}
}
@@ -581,23 +590,55 @@
}
@RequestMapping(value = "testListTLJGoods")
- public void getGoodsList(String callback,PrintWriter out) {
+ public void getGoodsList(String callback, PrintWriter out) {
SearchFilter sf = new SearchFilter();
- sf.setMaterialId("19450");
sf.setQuan(1);
sf.setTmall(true);
- sf.setStartTkRate(5);
- 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)));
}
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "addInviteOrderLevelOne")
+ public void addInviteOrderLevelOne(PrintWriter out) {
+ try {
+ System.out.println("-------------璇锋眰---------------");
+ integralGetService.addShareSingleGoods(974767L);
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ 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) {
+ }
+ }
+
}
--
Gitblit v1.8.0