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

yujian

2020-06-01 824d003d330a25b1f5b1e9ed30e4ad868868c2ab

 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -269,7 +269,9 @@
      categoryInfo.setCid1(goods.getCategoryId());

      categoryInfo.setCid1Name(goods.getCategoryName());

      cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());



      //存放折扣价

      cg.setCouponStartPrice(new BigDecimal(goods.getVipPrice()));

      cg.setCouponInfo(MoneyBigDecimalUtil.getWithNoZera(MoneyBigDecimalUtil.mul(new BigDecimal(goods.getDiscount()), new BigDecimal(10))) + "折");

      return cg;

   }