Merge branch 'saas_zx_2022-03-27' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -224,10 +224,14 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
 
     @Override
     public void batchInsert(CloudTeacherOrder cloudTeacherOrder, List<Integer> userIds,Boolean autoActivationFlag) {
-        Date date = new Date();
-        for (Integer userId : userIds) {
-            cloudTeacherOrder.setStudentId(userId);
-            this.activationMember(date,cloudTeacherOrder);
+        if(autoActivationFlag){
+            Date date = new Date();
+            for (Integer userId : userIds) {
+                cloudTeacherOrder.setStudentId(userId);
+                this.activationMember(date,cloudTeacherOrder);
+            }
+        }else {
+            cloudTeacherOrderDao.batchInsert(cloudTeacherOrder,userIds);
         }
     }