From 5737c1229b265456415a20c71f12229b941a4629 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 27 九月 2019 00:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 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 a666152..bb46625 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -45,9 +45,12 @@
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;
@@ -57,6 +60,7 @@
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;
@@ -65,6 +69,9 @@
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;
@@ -113,6 +120,10 @@
@Resource
private JedisPool jedisPool;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
@RequestMapping(value = "testimg")
public void testImg(HttpServletRequest request, PrintWriter out) {
@@ -538,4 +549,78 @@
}
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.setMaterialId("19450");
+ sf.setQuan(1);
+ sf.setTmall(true);
+ sf.setStartTkRate(5);
+ sf.setEndPrice(new BigDecimal(1000));
+ sf.setPage(1);
+ sf.setPage(100);
+
+ 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