1.老师解绑后结算方式调整

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

@@ -464,6 +464,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 userAccountService.save(userAccount);
             }
         } else {
+            // 如果机构解绑，更新机构ID为-1
+            if (Boolean.TRUE.equals(teacherSubmitReq.getBindTenant())) {
+                teacherSubmitReq.setTenantId(-1L);
+            }
             if (!teacher.getTenantId().equals(teacherSubmitReq.getTenantId())) {
                 TeacherWrapper.UpdateTenant updateTenant = new TeacherWrapper.UpdateTenant();
                 updateTenant.setTeacherId(teacher.getUserId());
@@ -949,10 +953,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 }
             });
             imUserFriendService.delFriendByTenantId(teacher.getTenantId(), teacher.getUserId());
+        }else {
+            if (ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
+                // 解绑后，结算方式如果是机构，默认调整为老师
+                teacher.setSettlementFrom(ESettlementFrom.TEACHER);
+                teacher.setIsSettlement(true);
+            }
         }
 
         teacher.setTenantId(updateTenant.getTenantId());
-        teacher.setSettlementFrom(ESettlementFrom.TENANT);
         this.updateById(teacher);
 
         Optional<TenantUnbindRecord> first = tenantUnbindRecordMapper.getRecord(oldTenantId,