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

admin

2020-06-15 6a47350594a4843f6cc36e5c94902d6fa97a6d4a

 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; // 无下级队员 --待激活

      }