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

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