1.更新激活码问题

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

@@ -484,6 +484,15 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 teacherSubmitReq.setTenantId(-1L);
             }
             if (!teacher.getTenantId().equals(teacherSubmitReq.getTenantId())) {
+                if (teacherSubmitReq.getTenantId().equals(-1L)) {
+                    // 平台老师处理流程
+                    if (ESettlementFrom.TENANT.equals(teacher.getSettlementFrom())) {
+                        // 解绑后，结算方式如果是机构，默认调整为老师
+                        teacherSubmitReq.setSettlementFrom(ESettlementFrom.TEACHER);
+                        teacherSubmitReq.setIsSettlement(true);
+                    }
+                }
+
                 TeacherWrapper.UpdateTenant updateTenant = new TeacherWrapper.UpdateTenant();
                 updateTenant.setTeacherId(teacher.getUserId());
                 updateTenant.setTenantId(teacherSubmitReq.getTenantId());

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/TenantActivationCodeController.java

@@ -12,6 +12,7 @@ import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.EActivationCode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +55,7 @@ public class TenantActivationCodeController extends BaseController {
         if (student == null) {
             throw new BizException("学生不存在");
         }
+        query.setSendStatus(EActivationCode.SEND);
         query.setActivationPhone(sysUser.getPhone());
         query.setTenantId(student.getTenantId());
         // 查询数据

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -160,6 +160,7 @@ public class TenantActivationCodeController extends BaseController {
         }
         boolean update = tenantActivationCodeService.lambdaUpdate()
                 .set(TenantActivationCode::getSendStatus, EActivationCode.WAIT)
+                .set(TenantActivationCode::getActivationPhone, "")
                 .eq(TenantActivationCode::getId, id)
                 .eq(TenantActivationCode::getActivationStatus, false)
                 .eq(TenantActivationCode::getSendStatus, EActivationCode.SEND)