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

yujian

2020-05-13 585b487cc71d06b2f76883f6f3b7247d1378874e

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -1570,7 +1570,7 @@
      if (couponType == CouponTypeEnum.freeCoupon.name()) {

         stateActivated = 0; //

      } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name()

            && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {

            && threeSaleSerivce.countFirstTeam(uid) <= 0) {

         stateActivated = 0; // 无下级队员 --待激活

      }