Merge branch '2022_cloud_activity' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -440,7 +440,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setLevel(1);
                 cloudTeacherOrder.setStatus(1);
                 cloudTeacherOrder.setType(activity.getPeriodEnum());
-                if(activity.getGiveCouponNum() == 1){
+                if(activity.getGiveCouponNum() == 1 && activity.getPeriodEnum() == PeriodEnum.MONTH){
                     cloudTeacherOrder.setTime(activity.getMemberTime() * studentPaymentOrder.getActivityBuyNum() * 2);
                 }else {
                     cloudTeacherOrder.setTime(activity.getMemberTime() * studentPaymentOrder.getActivityBuyNum());