Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/StudentTrainChartDto.java

@@ -19,6 +19,18 @@ public class StudentTrainChartDto {
     @ApiModelProperty("训练日期")
     private LocalDate trainDate;
 
+    @ApiModelProperty("训练日期")
+    private String trainDateStr;
+
+    public String getTrainDateStr() {
+        return trainDateStr;
+    }
+
+    public void setTrainDateStr(String trainDateStr) {
+        this.trainDateStr = trainDateStr;
+        this.trainDate = LocalDate.parse(trainDateStr);
+    }
+
     public StudentTrainChartDto() {
     }
 
@@ -47,8 +59,4 @@ public class StudentTrainChartDto {
     public LocalDate getTrainDate() {
         return trainDate;
     }
-
-    public void setTrainDate(LocalDate trainDate) {
-        this.trainDate = trainDate;
-    }
 }

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

@@ -531,6 +531,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-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -183,7 +183,7 @@
 
 	<select id="getUserTrainChartData" resultType="com.yonge.cooleshow.biz.dal.dto.StudentTrainChartDto">
 		SELECT
-			smcr.create_time_ trainDate,
+			DATE_FORMAT(smcr.create_time_, '%Y-%m-%d') trainDateStr,
 			COUNT(DISTINCT smcr.behavior_id_) trainNum,
 			SUM(smcr.play_time_) trainTime
 		FROM sys_music_compare_record smcr

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;
@@ -52,6 +53,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

@@ -159,6 +159,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)