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

yujian

2019-07-29 ac208d6f60284be820fe82dfdf44142f02d9e3ef

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java

@@ -477,6 +477,12 @@
      commissionInfo.setCommission(MoneyBigDecimalUtil

            .div(goods.getPrice().multiply(commissionInfo.getCommissionShare()), new BigDecimal(100)));



      String isFreeShipping = json.optString("isFreeShipping");

      if (!StringUtil.isNullOrEmpty(isFreeShipping)) {

         goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));

      }

		
		
      goods.setCommissionInfo(commissionInfo);

      goods.setCouponInfo(null);

      goods.setGoodCommentsShare(null);