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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -743,6 +743,11 @@


      String salesTip = pddGoods.getSalesTip();

      if (!StringUtil.isNullOrEmpty(salesTip)) {

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

         if (indexOf > 0) {

            salesTip = salesTip.substring(0, indexOf);

         }

			
         int totalSales = 0;

         if (salesTip.contains("万")) {

            salesTip = salesTip.substring(0, salesTip.indexOf("万"));