Merge branch 'feature/0721-tenant' into develop

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

@@ -179,9 +179,10 @@ public class UserAccountRecordServiceImpl extends ServiceImpl<UserAccountRecordD
             records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(),AccountBizTypeEnum.PRACTICE, bizIds));
         }else if(GoodTypeEnum.LIVE.equals(userOrderDetailVo.getGoodType())){
 
+            List<Long> groupId = Arrays.asList(userOrderDetailVo.getBizId());
+            records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(), AccountBizTypeEnum.LIVE_SHARE, groupId));
+
             if (userOrderDetailVo.getPaymentVersion().equals(EPaymentVersion.V1)) {
-                List<Long> groupId = Arrays.asList(userOrderDetailVo.getBizId());
-                records.addAll(baseMapper.selectRecordByOrderDetail(userOrderDetailVo.getOrderNo(), AccountBizTypeEnum.LIVE_SHARE, groupId));
                 //查询课程组下所有课程id
                 List<CourseSchedule> cancel = courseScheduleService.list(Wrappers.<CourseSchedule>lambdaQuery()
                         .eq(CourseSchedule::getCourseGroupId, userOrderDetailVo.getBizId())

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

@@ -29,7 +29,7 @@
         left join tenant_info i on r.tenant_id_ = i.id_
         <where>
             <if test="param.name != null and param.name != ''">
-                and t.name_ = #{param.name}
+                and t.name_ like CONCAT('%', #{param.name}, '%')
             </if>
             <if test="param.tenantId != null ">
                 and i.id_= #{param.tenantId}