Merge branch 'mater-1.6.0' into div

admin

2019-08-22 5e29ab710d30f709a90932d649941a679b5d040e

 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;