fix:曲目和专辑标签模糊查询

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -77,6 +77,9 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
     public int updateStatus(Long id, OmsUpdateStatusParam statusParam) {
         Integer status = statusParam.getStatus();
         OmsOrderReturnApply omsOrderReturnApply = returnApplyMapper.selectByPrimaryKey(id);
+        if (omsOrderReturnApply.getProductPrice().compareTo(statusParam.getReturnAmount()) <0) {
+            throw new BizException("退款金额不能大于商品金额");
+        }
         if (omsOrderReturnApply.getStatus().equals(statusParam.getStatus())) {
             return 1;
         }

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

@@ -53,7 +53,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList"  open="(" close=")"  separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>
@@ -93,7 +93,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList"  open="(" close=")"  separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>
@@ -170,7 +170,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList" open="(" close=")" separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>

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

@@ -88,13 +88,13 @@
         </if>
         <if test="param.musicTagIds != null and param.musicTagIds != ''">
             and
-            <foreach collection="param.musicTagIdList" separator="or" item="item">
+            <foreach collection="param.musicTagIdList" open="(" close=")" separator="or" item="item">
                 find_in_set(#{item},t.music_tag_)
             </foreach>
         </if>
         <if test="param.subjectIds != null and param.subjectIds != ''">
             and
-            <foreach collection="param.subjectIdList" separator="or" item="item">
+            <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                 find_in_set(#{item},t.music_subject_)
             </foreach>
         </if>
@@ -133,13 +133,13 @@
             </if>
             <if test="param.musicTagIds != null and param.musicTagIds != ''">
                 and
-                <foreach collection="param.musicTagIdList" separator="and" item="item">
+                <foreach collection="param.musicTagIdList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},t.music_tag_)
                 </foreach>
             </if>
             <if test="param.subjectIds != null and param.subjectIds != ''">
                 and
-                <foreach collection="param.subjectIdList" separator="and" item="item">
+                <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},t.music_subject_)
                 </foreach>
             </if>
@@ -375,7 +375,7 @@
             </if>
             <if test="param.musicTagList != null and param.musicTagList.size() != 0">
                 and
-                <foreach collection="param.musicTagList" separator="and" item="item">
+                <foreach collection="param.musicTagList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},ms.music_tag_)
                 </foreach>
             </if>