Merge branch 'feature/0721-tenant' into develop

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

@@ -4,13 +4,12 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.toolset.payment.base.enums.PaymentClientEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
@@ -58,7 +57,7 @@ public class OrderReq {
 
 
     @ApiModel(value = "OrderReqInfo对象", description = "下单请求业务详情对象")
-    public class OrderReqInfo {
+    public static class OrderReqInfo implements Serializable {
         @ApiModelProperty(value = "y用户id", hidden = true)
         private Long userId;
         @ApiModelProperty(value = "推荐用户id(有推荐人的情况)", hidden = true)

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

@@ -301,7 +301,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacherHomeVo.setTeacherDate(teacher.getTeacherDate());
         //身份证号、手机号脱敏
         teacherHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(teacherHomeVo.getIdCardNo()));
-        teacherHomeVo.setPhone(ValueUtil.fuzzyMobile(teacherHomeVo.getPhone()));
+//        teacherHomeVo.setPhone(ValueUtil.fuzzyMobile(teacherHomeVo.getPhone()));
         teacherHomeVo.setHeardUrl(teacher.getAvatar());
         teacherHomeVo.setIsVip(teacher.getIsVip());
         int num = DateUtil.daysBetween(new Date(), teacher.getMembershipEndTime());

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysSuggestionMapper.xml

@@ -94,7 +94,8 @@
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysSuggestion" parameterType="map">
         SELECT ss.*,
-               CASE WHEN ss.client_type_='STUDENT' THEN su.username_ ELSE su.real_name_ END username_
+        CASE WHEN (ss.client_type_='STUDENT' or ss.client_type_ = 'TENANT_STUDENT') THEN su.username_ ELSE su.real_name_ END
+        username_
         FROM sys_suggestion ss
         LEFT JOIN sys_user su ON su.id_ = ss.user_id_
         <include refid="queryCondition" />