Merge remote-tracking branch 'origin/master'

admin

2019-04-04 3a6e476b2f498e876ff10f1328455f58e63ee85a

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

@@ -224,6 +224,8 @@


         if (!StringUtil.isNullOrEmpty(item.optString("material_lib_type")))

            goods.setMaterialLibType(item.optInt("material_lib_type"));

         else

            goods.setMaterialLibType(0);



         return goods;

      }

@@ -337,7 +339,9 @@
               goods.setFreeShipment(1);



            if ("1".equalsIgnoreCase(item.optString("material_lib_type")))

               ;

               goods.setMaterialLibType(1);

            else

               goods.setMaterialLibType(0);



            goodsList.add(goods);

         }

@@ -385,6 +389,7 @@
                  g.setCouponStartFee(new BigDecimal(0));

               }

               g.setCreatetime(new Date());

               g.setMaterialLibType(goods.getMaterialLibType());

               return g;

            }

         }

@@ -452,6 +457,7 @@
                  g.setCouponStartFee(new BigDecimal(0));

               }

               g.setCreatetime(new Date());

               g.setMaterialLibType(goods.getMaterialLibType());

               return g;

            }

         }

@@ -1658,6 +1664,10 @@
         goods.setAuctionUrl(itemLink);

         if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info")))

            goods.setCouponLink(couponLink);

         String tkRate = resultJSON.optString("max_commission_rate");

         if (!StringUtil.isNullOrEmpty(tkRate)) {

            goods.setTkRate(new BigDecimal(tkRate));

         }

         return goods;

      } catch (TaoKeApiException e) {

         e.printStackTrace();

@@ -1776,6 +1786,7 @@
      }

      goods.setReservePrice(new BigDecimal(0));

      goods.setTotalFee(new BigDecimal("0"));

      goods.setPictUrlWhite(item.optString("white_image"));

      return goods;

   }