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

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

 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();