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

yujian

2019-12-12 6d821cbdf527a4b3ee2e93f8d625ecade86ba45b

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

@@ -81,6 +81,8 @@
         } else {

            cg.setCouponAmount(new BigDecimal(0));

         }

         cg.setCouponLeftCount(1);

         cg.setCouponTotalCount(1);

      }

      

      JDCommissionInfo commissionInfo = goods.getCommissionInfo();