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/factory/CommonOrderGoodsFactory.java

@@ -35,7 +35,7 @@
      goods.setGoodsId(detail.getGoodsId() + "");

      goods.setCreateTime(new Date());

      goods.setGoodsType(Constant.SOURCE_TYPE_PDD);

      goods.setPicture(detail.getGoodsImageUrl());

      goods.setPicture(detail.getGoodsThumbnailUrl());

      goods.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(detail.getMinNormalPrice()), new BigDecimal(100)));

      goods.setShopId(detail.getMallId());

      goods.setShopName(detail.getMallName());