Merge remote-tracking branch 'origin/div' into div

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

 fanli/src/test/java/org/fanli/TaoKeTest.java

@@ -22,16 +22,16 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

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.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -48,16 +48,27 @@


   @Test

   public void test1() {


      TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(16432, 1, 100);

      System.out.println(result);

   }



   @Test

   public void test2() {

      System.out.println(HttpUtil.getShortLink("http://h5.flq001.com"));

      System.out.println(HttpUtil.getShortLink("http://h5.flq002.com"));

      System.out.println(HttpUtil.getShortLink("http://h5.flq003.com"));

      System.out.println(HttpUtil.getShortLink("http://h5.flq004.com"));

      System.out.println(HttpUtil.getShortLink("http://h5.flq005.com"));



      TaoBaoGoodsBrief goods = null;

      try {

         goods = TaoKeApiUtil.searchGoodsDetail(601535036423L);



         // goods = TaoKeApiUtil.searchGoodsDetail(601535036423L, new

         // TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,

         // TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

         // TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));

      } catch (TaobaoGoodsDownException e2) {

         e2.printStackTrace();

      }

      System.out.println(goods);



      // goods = TaoKeApiUtil.searchGoodsDetail(auctionId);

   }



   @Test

@@ -66,13 +77,13 @@
      String appKey = "27821872";

      String appSecret = "9277b7c40b753e142303eeabc1936c80";

      String pid = "mm_491980152_690500060_109327900051";

      TaoKeAppInfo app=new TaoKeAppInfo(appKey, appSecret, pid);

      TaoKeAppInfo app = new TaoKeAppInfo(appKey, appSecret, pid);



      try {

         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);

      } catch (TaoKeApiException e) {

      } catch (Exception e) {

         e.printStackTrace();

      }

   }