From 8b505f74e1094fd67f86373ab9e9f80b54bca54e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 11 十月 2019 12:12: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 | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 210 insertions(+), 0 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 e292df4..86b8bb9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -8,7 +8,9 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import javax.annotation.Resource;
@@ -34,12 +36,21 @@
import com.google.gson.Gson;
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.jd.JDSearchResult;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.dynamic.DynamicInfo;
+import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.exception.ActivityException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -48,14 +59,25 @@
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.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.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.taobao.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
@Controller
@RequestMapping("test")
@@ -88,7 +110,20 @@
private ConfigService configService;
@Resource
+ private HongBaoManageService hongBaoManageService;
+
+ @Resource
private InviteMaterialService inviteMaterialService;
+
+ @Resource
+ private DynamicInfoDao dynamicInfoDao;
+
+ @Resource
+ private JedisPool jedisPool;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -413,4 +448,179 @@
e.printStackTrace();
}
}
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "getJingFenList")
+ public void getJingFenList(String callback, Integer page, Integer eliteId, PrintWriter out) {
+ try {
+ JDSearchResult result = JDApiUtil.getJingFenGoods(page, eliteId);
+ long count = 0;
+ JSONObject data = new JSONObject();
+ JSONArray array = new JSONArray();
+ if (result != null) {
+ PageEntity pageEntity = result.getPageEntity();
+ if (pageEntity != null) {
+ count = pageEntity.getTotalCount();
+ }
+
+ List<JDGoods> goodsList = result.getGoodsList();
+ if (goodsList != null && goodsList.size() > 0) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ for (JDGoods goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate, shareRate);
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ }
+ }
+
+ data.put("count", count);
+ data.put("list", array);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "queryExistsId")
+ public void queryExistsAuctionId(PrintWriter out) {
+ try {
+ List<DynamicInfo> list = dynamicInfoDao.queryExistsAuctionId();
+ for (DynamicInfo dynamicInfo : list) {
+ List<GoodsPicture> imgs = dynamicInfo.getImgs();
+ if (imgs == null || imgs.size() == 0) {
+ continue;
+ }
+
+ boolean update = false;
+ for (GoodsPicture goodsPicture : imgs) {
+ TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
+ if (goods == null) {
+ continue;
+ }
+
+ if (goods.getAuctionId() == null) {
+ update = true;
+ goods.setAuctionId(goods.getId());
+ }
+ }
+
+ if (update) {
+ dynamicInfo.setImgs(imgs);
+ dynamicInfoDao.updateGoodInfo(dynamicInfo);
+ }
+ }
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ // JsonUtil.printMode(out, null,
+ // JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ @RequestMapping(value = "getWaitingThreadsCount")
+ public void getWaitingThreadsCount(PrintWriter out) {
+ out.print(Constant.waitingThreadSet.size());
+ }
+
+ @RequestMapping(value = "getBinFaRedisKey")
+ public void getPinFaRedisKey(PrintWriter out) {
+ JSONArray array = new JSONArray();
+ Jedis jedis = jedisPool.getResource();
+ try {
+ Set<String> sets = jedis.keys("rs-*");
+ for (Iterator<String> its = sets.iterator(); its.hasNext();)
+ array.add(its.next());
+ } finally {
+ jedisPool.returnResource(jedis);
+ }
+ out.println(array.toString());
+ }
+
+ @RequestMapping(value = "pushOppo")
+ public void pushOppo(String registerId, PrintWriter out) {
+ List<String> registerIds = new ArrayList<>();
+ registerIds.add(registerId);
+ try {
+ OPPOPushUtil.pushUrl(registerIds, "娴嬭瘯缃戦〉鎺ㄩ��", "娴嬭瘯缃戦〉鎺ㄩ�佸唴瀹�", "http://www.baidu.com");
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ OPPOPushUtil.pushGoods(registerIds, "娴嬭瘯鍟嗗搧缃戦〉鎺ㄩ��", "娴嬭瘯鍟嗗搧鎺ㄩ�佸唴瀹�", 1, 577628549116L);
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ OPPOPushUtil.pushUserSignInNotification(registerIds, "娴嬭瘯绛惧埌鎺ㄩ��", "娴嬭瘯绛惧埌鎺ㄩ��");
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+ try {
+ OPPOPushUtil.pushWelfareCenter(registerIds, "娴嬭瘯绂忓埄涓績鎺ㄩ��", "娴嬭瘯绂忓埄涓績鎺ㄩ��");
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+ try {
+ OPPOPushUtil.pushZNX(registerIds, "娴嬭瘯绔欏唴淇℃帹閫�", "娴嬭瘯绔欏唴淇℃帹閫�");
+ } catch (PushException e) {
+ e.printStackTrace();
+ }
+
+ out.print("success");
+ }
+
+ @RequestMapping(value = "testListTLJGoods")
+ public void getGoodsList(String callback,PrintWriter out) {
+ SearchFilter sf = new SearchFilter();
+ sf.setQuan(1);
+ sf.setTmall(true);
+// 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();
+ 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();
+ }
+ }
+
}
--
Gitblit v1.8.0