Merge branch 'develop'

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -297,11 +297,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
         this.updateRongCloudUserInfo(id, setReq.getClientType());
 
         // 更新老师、学生头像
-        if (StringUtils.isNotEmpty(setReq.getAvatar())) {
+        String clientId = setReq.getClientId();
+        if(StringUtils.isEmpty(clientId)) {
+            clientId =setReq.getClientType();
+        }
+        if (StringUtils.isNotEmpty(setReq.getAvatar()) && StringUtils.isNotEmpty(clientId)) {
             if (EClientType.STUDENT.getCode().equals(setReq.getClientType()) ||
                     EClientType.TEACHER.getCode().equals(setReq.getClientType()) ||
                     EClientType.SYSTEM.getCode().equals(setReq.getClientType())) {
-                sysUserDao.updateAvatar(setReq.getClientId(), setReq.getAvatar(), id);
+                sysUserDao.updateAvatar(clientId, setReq.getAvatar(), id);
             }
         }
     }

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -372,13 +372,13 @@
     </update>
 
     <update id="updateAvatar">
-        <if test="sysUserType == 'STUDENT'">
+        <if test="clientId == 'STUDENT'">
             update student set avatar_ = #{avatar} where user_id_ = #{id}
         </if>
-        <if test="sysUserType == 'TEACHER'">
+        <if test="clientId == 'TEACHER'">
             update teacher set avatar_ = #{avatar} where user_id_ = #{id}
         </if>
-        <if test="sysUserType == 'SYSTEM'">
+        <if test="clientId == 'SYSTEM'">
             update sys_user set avatar_ = #{avatar} where id_ = #{id}
         </if>
     </update>

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

@@ -56,4 +56,8 @@ public class OrderSearch extends QueryInfo{
 
     @ApiModelProperty(value = "版本",hidden = true)
     private EPaymentVersion paymentVersion;
+
+
+    @ApiModelProperty("keyword 订单名称查询")
+    private String keyword;
 }

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

@@ -158,7 +158,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         //身份证号、手机号脱敏
         studentHomeVo.setIdCardNo(ValueUtil.fuzzyIdCard(studentHomeVo.getIdCardNo()));
 //        studentHomeVo.setPhone(ValueUtil.fuzzyMobile(studentHomeVo.getPhone()));
-        studentHomeVo.setHeardUrl(user.getAvatar());
+        String avatar = user.getAvatar();
+        if (StringUtils.isNotBlank(detail.getAvatar())) {
+            avatar = detail.getAvatar();
+        }
+        studentHomeVo.setHeardUrl(avatar);
 
         int num = DateUtil.daysBetween(new Date(), detail.getMembershipEndTime());
         studentHomeVo.setMembershipDays(num < 0 ? 0 : num);

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

@@ -139,6 +139,9 @@
             <if test="param.tenantId != null">
                 and t.tenant_id_ = #{param.tenantId}
             </if>
+            <if test="param.keyword != null and param.keyword != ''">
+                and t.order_name_ like CONCAT('%', #{param.keyword}, '%')
+            </if>
             <if test="param.paymentVersion != null">
                 and t.payment_version_ = #{param.paymentVersion}
             </if>