Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/StudentServiceImpl.java

@@ -601,6 +601,16 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
 //             删除好友
             imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),
                     ClientEnum.STUDENT.getCode());
+
+            // 加好友
+            QueryWrapper<Teacher> query = new QueryWrapper<>();
+            query.lambda().eq(Teacher::getTenantId, newTenantId);
+            List<Teacher> teachers = teacherDao.selectList(query);
+            for (Teacher teacher : teachers) {
+                HashSet<Long> studentIds = new HashSet<>();
+                studentIds.add(student.getUserId());
+                imUserFriendService.saveUserFriend(teacher.getUserId(), studentIds);
+            }
         }
 
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserPaymentCoreServiceImpl.java

@@ -1188,6 +1188,9 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                             }
 
                         }
+                        if (EPaymentStatus.WAIT_PAY == paymentStatus) {
+                            return;
+                        }
 
                         // 支付时间未超时，同步订单状态
                         if (EPaymentStatus.PAYING == paymentStatus