fix(fs-service): 更新微信商户配置

- 将 isNewWxMerchant 配置从 true 更改为 false
- 确保新商户正确走 mpOpenId 流程

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseMapper.java

@@ -157,7 +157,17 @@ public interface FsUserCourseMapper
             "<if test ='maps.companyIdsList != null and maps.companyIdsList.length !=0 '> " +
             " and <foreach collection='maps.companyIdsList'  item='item' index='index'  open='( 1=2 ' separator='' close=')'> or find_in_set(  #{item} , REGEXP_REPLACE ( c.company_ids, '[\"\\\\[\\\\]]', '' ) )  </foreach> " +
             "</if> " +
-            " order by c.sort, c.course_id  "+
+            "<choose>" +
+            "<when test='maps.sorting != null and maps.sorting == 1'> " +
+            "order by c.sort asc " +
+            "</when>" +
+            "<when test='maps.sorting != null and maps.sorting == 2'> " +
+            "order by c.sort desc " +
+            "</when>" +
+            "<otherwise> " +
+            "order by c.sort asc, c.course_id asc " +
+            "</otherwise>" +
+            "</choose>" +
             "</script>"})
     List<FsUserCourseListPVO> selectFsUserCourseListPVO(@Param("maps") FsUserCourse param);
 

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -95,10 +95,10 @@ public interface FsUserCourseVideoMapper
             "</if>" +
             "<choose>"+
             "<when test = 'maps.sorting!=null and maps.sorting==1 '> " +
-            "order by v.video_id asc"+
+            "order by v.course_sort asc"+
             "</when>"+
             "<when test = 'maps.sorting!=null and maps.sorting==2 '> " +
-            "order by v.video_id desc"+
+            "order by v.course_sort desc"+
             "</when>"+
             "<otherwise>"+
             " order by v.course_sort  "+

fs-service/src/main/resources/application-druid-bjczwh.yml

@@ -151,7 +151,7 @@ openIM:
     userID: imAdmin
     url: https://web.im.fbylive.com/api
 #是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: true
+isNewWxMerchant: false
 #是否使用新im
 im:
     type: NONE