From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息
---
fanli/src/test/java/org/fanli/TaoKeTest.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 61 insertions(+), 42 deletions(-)
diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 6411807..0ca55a0 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -1,3 +1,4 @@
+
package org.fanli;
import java.io.File;
@@ -10,11 +11,11 @@
import java.util.List;
import java.util.Map;
-import org.junit.Ignore;
import org.junit.Test;
import org.yeshi.utils.HttpUtil;
import com.yeshi.fanli.dao.mybatis.taobao.TBPidMapper;
+import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -24,20 +25,20 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.job.UpdateRelationAndSpecialOrderJob;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
-import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.TBPidService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.BeanUtil;
-import com.yeshi.fanli.util.SpringContext;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -49,54 +50,72 @@
@Test
public void test1() {
- UpdateRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob= BeanUtil.getBean(UpdateRelationAndSpecialOrderJob.class);
- SpringContext.initCOS();
- updateRelationAndSpecialOrderJob.doJob2();
+ // List<TaoBaoGoodsBrief> list=
+ // TaoKeApiUtil.guessLikeByAuctionId(550439753563L,6);
+ // System.out.println(list);
+ // TaoBaoUtil.getTBDetailImageWithSize(597016140493L);
+ // System.out.println(goods);
+ // DaTaoKeApiUtil.getGoodsDetailByGoodsId(558195316187L);
+ // try {
+ // TaoKeApiUtil.specialConvertCoupon(608512721647L, new
+ // TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ // TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+ // TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
+ // } catch (Exception e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+
+ // String link = TaoKeApiUtil.officialActivityConvert(87140050199L + "",
+ // "1571715733668", "513796574");
+ // System.out.println(link);
+
+ // String link =
+ // TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ // "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", 6396582L,
+ // "share");
+ // System.out.println(link);
+
+ // try {
+ // TaoKeApiUtil.searchGoodsDetail(608512721647L);
+ // } catch (TaobaoGoodsDownException e) {
+ // e.printStackTrace();
+ // }
+
+ List<TaoBaoOrder> list = TaoKeOrderApiUtil.getTaoBaoRelationOrderList(
+ TimeUtil.convertToTimeTemp("2019-12-09 10:13:52", "yyyy-MM-dd HH:mm:ss"),
+ TimeUtil.convertToTimeTemp("2019-12-09 10:14:53", "yyyy-MM-dd HH:mm:ss"), 1);
+ System.out.println(list);
}
@Test
public void test2() {
- TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAdzoneId("44841750025");
- app.setAppKey("25070111");
- app.setAppSecret("c7809ad9cd926fc45199d1d3ab7fe2eb");
- app.setPid("mm_124933865_113050446_44841750025");
+ String link = TaoKeApiUtil.officialActivityConvert("87140050199", "1571715733668", "20211660");
+ System.out.println(link);
+ // https://s.click.taobao.com/t?e=m%3D2%26s%3DW%2Fys7R71JXMcQipKwQzePCperVdZeJviyK8Cckff7TVRAdhuF14FMXC%2FEJQELlNo5x%2BIUlGKNpVpS9y0ojX%2FfMsvmRQfeMsreH9%2FasRClvq63GoCXmcqkTiRUN2xVR4GdesO8XD8dsNdITvXwTxvKDqJgCOacH%2BU%2FVJqtNeEg5OOvkjnk315zzvflh4%2Fhqj8BmyXDtEFdgwjGkouqJtJeds5wF0j1Yhhp1953%2FcnpLUV6UUID4c8TeTEWJdP8jmRdTEuB5K8MGvkLv1nNhnYz%2FB0z8qlrv%2Bjr%2B%2FiM5RbEEle7auY0HPYWszlTEcWhO9mli2vZjCuAmyG1kYtrC7hgcEnE%2FQxigjMfFc2hYciEyAdpuz3kb9JWJVVX36lFeRKtwLUkdbL0syg%2BG8%2FlCRQJ1YlOPkYHNIul3paqKYwK75NNUki5Nwcg2GYz3Bez8Z8OusR9%2BDFlSU%2BcenL13XDY2hrrfx7OMbmkUtLKDKbz1CCoC2zoKs%2FmnEqY%2Bakgpmw&pvid=24980167&union_lens=lensId:0b013a8d_0cec_16df214d979_38a1
+
+ }
+
+ @Test
+ public void test3() {
+ Long auctionId = 598165623087L;
+ String appKey = "27965236";
+ String appSecret = "2be7a216bee767dc3a6388aa24f11140";
+ String pid = "mm_502940004_754900291_109486750166";
+ TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);
+
try {
- TaoBaoGoodsBrief goods = TaoKeApiUtil.searchGoodsDetail(527893773636L, app);
- System.out.println(goods.getId());
- } catch (TaobaoGoodsDownException e) {
+ TaoLiJinDTO dto = TaoKeApiUtil.createTaoLiJin(auctionId, "娣樼ぜ閲�", new BigDecimal(1), 1, new Date(),
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), new Date(),
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12L), app);
+ System.out.println(dto);
+ } catch (Exception e) {
e.printStackTrace();
}
}
@Test
- public void test3() {
- // try {
- // EmergencyUtil.baoJin("monitor-error-tb-app-limit-24980167",
- // "娣樺疂APPKey璇锋眰闄愬埗銆�24980167銆�", new String[] { "18581318252" });
- // } catch (Exception e1) {
- //
- // }
- // 0K6TBHS%2F84vpYy%2FzKPWwH6J7%2BkHL3AEW
- // 2PlyMHAEtzjJX3K6R73L5KJ7%2BkHL3AEW
- Long[] auctionIds = new Long[] { 528561708277L, 563689377074L, 570752677800L, 569281626446L, 567165767332L,
- 555437572417L, 534857332052L, 565233575889L, 565536124572L };
-
- for (Long auctionId : auctionIds)
- TaoKeApiUtil.createTaoLiJin(auctionId, "杩斿埄鍒告柊浜烘窐绀奸噾绾㈠寘", new BigDecimal("1.00"), 1, 1, new Date(),
- new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24L), new Date());
- // TaoKeApiUtil.getLiJinXG();
- // String
- // url="https://uland.taobao.com/taolijin/edetail?eh=aIrBfHZGd4iZuQF0XRz0iAXoB+DaBK5LQS0Flu/fbSp4QsdWMikAalrisGmre1Id0BFAqRODu114yl7QZ1qFyc7LbOC0oAuo+MUwzxYlSKECGml30RY8PBx5jSVkulpmRQIlrKaDNziGVmobyGguP+jgTFwOoHsRe9593cvcC9QGQASttHIRqdGO5qxVOPQ2buEoHk5wx6hxhsv5QYr1rbcOQrCzclRfPTIk7Z0myMWxZvcNeMU+E+L71lQF+6uZp7DLcYmoygrjfjYOW9fVleIg09jheaZgonv6QcvcARY=&union_lens=lensId:0b0b4505_0c2a_16af789993f_0880;traffic_flag=lm";
- // String token=
- // TaoKeApiUtil.getTKToken("https://img.alicdn.com/imgextra/i4/2256112408/O1CN01EKNifJ1TeuF9x4it9_!!2256112408.jpg_400x400.jpg",
- // "鏃楃澘鐢甸鎵囧彴寮忓鐢�12瀵�16瀵搁潤闊冲鐢熷鑸嶆憞澶村畾鏃惰妭鑳藉彴鎵囪惤鍦版墖", url);
- // System.out.println(token);
- }
-
- @Test
public void test4() {
-
TaoBaoOrderService taoBaoOrderService = BeanUtil.getBean(TaoBaoOrderService.class);
try {
List<TaoBaoOrder> list = TaoBaoOrderUtil.parseOrder(
--
Gitblit v1.8.0