Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -25,7 +25,9 @@
import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;

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

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

import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.TLJLogHelper;

import com.yeshi.fanli.log.TaoKeLogHelper;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -38,46 +40,6 @@


//淘宝客API接口

public class TaoKeApiUtil {



   /**

    * 按关键字和分类搜索券

    * 
    * @param key

    * @param catList

    * @return

    */

   public static TaoBaoSearchResult searchCouple(String key, List<Long> catList, int page, int pageSize) {

      Map<String, String> map = new HashMap<>();

      map.put("method", "taobao.tbk.dg.item.coupon.get");

      map.put("page_size", pageSize + "");

      map.put("page_no", page + "");

      String cate = "";

      if (catList != null && catList.size() > 10)

         catList = catList.subList(0, 10);

      if (catList != null && catList.size() > 0) {

         for (Long c : catList)

            cate += c + ",";

         if (cate.endsWith(","))

            cate = cate.substring(0, cate.length() - 1);

         map.put("cat", cate);

      }



      if (!StringUtil.isNullOrEmpty(key)) {

         map.put("q", key);

      }

      String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);

      System.out.println(result);

      TaoBaoSearchResult finalResult = parseCoupleContent(result);

      if (finalResult == null)

         return null;

      PageEntity pageEntity = finalResult.getPageEntity();

      pageEntity.setPageIndex(page);

      pageEntity.setPageSize(pageSize);

      pageEntity.setTotalPage(pageEntity.getTotalCount() % pageSize == 0

            ? ((int) (pageEntity.getTotalCount() / pageSize)) : (int) (pageEntity.getTotalCount() / pageSize + 1));

      finalResult.setPageEntity(pageEntity);

      return finalResult;

   }



   // 解析券的内容

   private static TaoBaoSearchResult parseCoupleContent(String content) {

@@ -377,22 +339,6 @@
            System.out.println(goods.getAuctionId() + ":" + g.getAuctionId());

            if (goods.getAuctionId().longValue() == g.getAuctionId()) {

               g.setId(goods.getAuctionId());

               // 判断是否有优惠券

               if (!StringUtil.isNullOrEmpty(g.getCouponActivityId())) {

                  // 获取优惠券详情

                  QuanInfo quanInfo = getQuanInfo(g.getAuctionId(), g.getCouponActivityId());

                  if (quanInfo != null) {

                     g.setCouponAmount(quanInfo.coupon_amount);

                     g.setCouponEffectiveEndTime(quanInfo.coupon_end_time);

                     g.setCouponEffectiveStartTime(quanInfo.coupon_start_time);

                     g.setCouponLeftCount(quanInfo.coupon_remain_count);

                     g.setCouponStartFee(quanInfo.coupon_start_fee);

                     g.setCouponTotalCount(quanInfo.coupon_total_count);

                  }

               } else {

                  g.setCouponAmount(new BigDecimal(0));

                  g.setCouponStartFee(new BigDecimal(0));

               }

               g.setCreatetime(new Date());

               g.setMaterialLibType(goods.getMaterialLibType());

               return g;

@@ -930,10 +876,9 @@
      if (!StringUtil.isNullOrEmpty(goods.getCouponInfo())) {

         List<BigDecimal> quanInfo = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());

         goods.setCouponAmount(quanInfo.get(1));

         goods.setCouponEffectiveEndTime(

               TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24, "yyyy-MM-dd"));

         goods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));

         goods.setCouponStartFee(quanInfo.get(0));

         goods.setCouponEffectiveEndTime(item.optString("coupon_end_time"));

         goods.setCouponEffectiveStartTime(item.optString("coupon_start_time"));

         goods.setCouponStartFee(new BigDecimal(item.optString("coupon_start_fee")));

         goods.setCouponLeftCount(item.optInt("coupon_remain_count"));

         goods.setCouponLink("https:" + item.optString("coupon_share_url"));

         goods.setCouponTotalCount(item.optInt("coupon_total_count"));

@@ -1295,41 +1240,6 @@
      dto.setListInfo(list);

      dto.setPage(pageEntity);

      return dto;

   }



   /**

    * TODO 按设备猜你喜欢

    * 
    * @param userNickName

    * @param os

    * @param imei

    * @param idfa

    * @param ip

    * @param ua

    * @param net

    * @param pageNo

    * @param pageSize

    */

   public static void guessLikeByDevice(String userNickName, String os, String imei, String idfa, String ip, String ua,

         String net, int pageNo, int pageSize) {

      Map<String, String> map = new HashMap<>();

      map.put("method", "taobao.tbk.item.guess.like");

      if (!StringUtil.isNullOrEmpty(userNickName))

         map.put("user_nick", userNickName);

      map.put("os", os + "");

      if (!StringUtil.isNullOrEmpty(idfa))

         map.put("idfa", idfa);

      if (!StringUtil.isNullOrEmpty(imei)) {

         map.put("imei", imei + "");

         map.put("imei_md5", StringUtil.Md5(imei));

      }

      map.put("ip", ip + "");

      map.put("ua", ua + "");

      map.put("net", net + "");

      map.put("page_no", pageNo + "");

      map.put("page_size", pageSize + "");

      String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);

      System.out.println(resultStr);

   }



   /**

@@ -1781,7 +1691,7 @@
   public static void taoKeContent() {

      Map<String, String> map = new HashMap<>();

      map.put("method", "taobao.tbk.content.get");

      map.put("adzone_id", TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);

      map.put("adzone_id", TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT.split("_")[3]);

      map.put("type", "1");

      map.put("count", "100");



@@ -1995,7 +1905,7 @@
   // 淘礼金创建

   public static TaoLiJinDTO createTaoLiJin(Long auctionId, String name, BigDecimal perface, int totalNum,

         Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime, TaoKeAppInfo app)

         throws TaoKeApiException {

         throws TaoKeApiException, TaoLiJinCreateException {

      Map<String, String> map = new HashMap<>();

      map.put("method", "taobao.tbk.dg.vegas.tlj.create");

      map.put("adzone_id", app.getPid().split("_")[3]);

@@ -2037,14 +1947,15 @@
            // 接口返回异常

            String msgCode = root.optJSONObject("result").optString("msg_code");

            if (!StringUtil.isNullOrEmpty(msgCode)) {

               TLJLogHelper.info(auctionId, root.toString());// 淘礼金异常信息记录

               switch (msgCode) {

               case "FAIL_BIZ_ITEM_FORBIDDEN":

                  throw new TaoKeApiException(TaoKeApiException.CODE_TLJ_FORBIDDEN, "该商品不支持创建淘礼金红包");

                  throw new TaoLiJinCreateException(TaoLiJinCreateException.CODE_TLJ_FORBIDDEN, "该商品不支持创建淘礼金红包");

               case "FAIL_BIZ_ACCOUNT_UN_PAID":

               case "PRE_FREEZE_ASSET_ACCOUNT_ERROR":

                  throw new TaoKeApiException(TaoKeApiException.CODE_TLJ_NO_MONEY, "官方玩法钱包余额不足");

                  throw new TaoLiJinCreateException(TaoLiJinCreateException.CODE_TLJ_NO_MONEY, "官方玩法钱包余额不足");

               default:

                  return null;

                  throw new TaoKeApiException(Integer.parseInt(msgCode), root.toString());

               }

            }

         }