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

yujian

2019-09-10 9dfd71c4bde5afe4bf9bb9a8ec07549e4790b992

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

@@ -161,6 +161,11 @@
      String salesTip = goods.getSalesTip();

      if (StringUtil.isNullOrEmpty(salesTip)) {

         salesTip = "0";

      } else {

         int indexOf = salesTip.indexOf("+");

         if (indexOf > 0) {

            salesTip = salesTip.substring(0, indexOf);

         }

      }

      

      int totalSales = 0;