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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

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

@@ -57,15 +57,15 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TaoBaoHttpUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -1690,7 +1690,8 @@
            MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));

      taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());

      taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));

      taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus());

      if (detail.getQuanReceive() != null)

         taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive());

      taoBaoGoods.setPictUrl(detail.getPic());

      taoBaoGoods.setPictUrlWhite(detail.getPic());

      taoBaoGoods.setSellerId(detail.getSellerId());

@@ -1898,6 +1899,25 @@
      return "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;

   }



   /**

    * 是否可以加入淘礼金的预选商品库

    * 
    * @param v2

    * @return

    */

   public static boolean canAddToTLJBuyGoods(TaoBaoGoodsBrief goods) {

      BigDecimal tljMoney = getShareGoodsHongBaoInfo(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);

      // 不能小于1块

      if (tljMoney.compareTo(new BigDecimal(1)) < 0 || tljMoney.compareTo(new BigDecimal(10)) > 0)

         return false;



      // 券后价不能大于150

      if (getAfterUseCouplePrice(goods).compareTo(new BigDecimal(150)) > 0)

         return false;



      return true;

   }



   public static void main(String[] args) {

      String s = channelMap.get("3");

      System.out.println(s);