Merge branch 'jxl-sqb' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/artistLineup.html

@@ -688,6 +688,15 @@
         let selectedArtists = []; // 当前已选艺人列表
         let currentModalArtists = []; // 当前搜索结果中的艺人列表
 
+        /** 艺人 ID 统一成字符串。jQuery .data() 会把 191 这类短数字转成 Number，导致 === 匹配失败 */
+        function artistIdStr(id) {
+            return id == null ? '' : String(id);
+        }
+
+        function sameArtistId(a, b) {
+            return artistIdStr(a) === artistIdStr(b);
+        }
+
         function openAssociateArtistModal(timesId) {
             $('#associateArtistModal').data('timesId', timesId);
             // 重置状态
@@ -734,7 +743,7 @@
                         selectedArtists = (response.data || [])
                             .map(function (a) {
                                 return {
-                                    artistId: a.artistId,
+                                    artistId: artistIdStr(a.artistId),
                                     artistName: a.artistName,
                                     avatarUrl: a.avatarUrl,
                                     sort: a.sort || 0
@@ -804,8 +813,9 @@
 
             let html = '';
             artists.forEach(function (artist) {
-                const isSelected = selectedArtists.some(a => a.artistId === artist.artistId);
-                html += '<div class="modal-artist-item" data-artist-id="' + artist.artistId + '">';
+                const artistId = artistIdStr(artist.artistId);
+                const isSelected = selectedArtists.some(a => sameArtistId(a.artistId, artistId));
+                html += '<div class="modal-artist-item" data-artist-id="' + artistId + '">';
                 html += '<img src="' + (artist.avatarUrl || '/img/profile.jpg') + '" class="modal-artist-avatar" onerror="this.src=\'/img/profile.jpg\'">';
                 html += '<div class="modal-artist-name">' + escapeHtml(artist.artistName) + '</div>';
                 html += '<div class="artist-radio-btn' + (isSelected ? ' selected' : '') + '"></div>';
@@ -817,22 +827,22 @@
 
             // 点击整行切换选中状态
             listContainer.find('.modal-artist-item').on('click', function () {
-                const artistId = $(this).data('artist-id');
-                const artist = currentModalArtists.find(a => a.artistId === artistId);
+                const artistId = artistIdStr($(this).attr('data-artist-id'));
+                const artist = currentModalArtists.find(a => sameArtistId(a.artistId, artistId));
                 if (!artist) return;
 
                 const radioBtn = $(this).find('.artist-radio-btn');
-                const isSelected = selectedArtists.some(a => a.artistId === artistId);
+                const isSelected = selectedArtists.some(a => sameArtistId(a.artistId, artistId));
 
                 if (isSelected) {
                     // 取消选中
-                    selectedArtists = selectedArtists.filter(a => a.artistId !== artistId);
+                    selectedArtists = selectedArtists.filter(a => !sameArtistId(a.artistId, artistId));
                     radioBtn.removeClass('selected');
                 } else {
                     // 选中，防止重复
-                    if (!selectedArtists.some(a => a.artistId === artistId)) {
+                    if (!selectedArtists.some(a => sameArtistId(a.artistId, artistId))) {
                         selectedArtists.push({
-                            artistId: artist.artistId,
+                            artistId: artistId,
                             artistName: artist.artistName,
                             avatarUrl: artist.avatarUrl
                         });
@@ -856,7 +866,7 @@
 
             let html = '';
             selectedArtists.forEach(function (artist) {
-                html += '<div class="selected-artist-card" draggable="true" data-artist-id="' + artist.artistId + '">';
+                html += '<div class="selected-artist-card" draggable="true" data-artist-id="' + artistIdStr(artist.artistId) + '">';
                 html += '<img src="' + (artist.avatarUrl || '/img/profile.jpg') + '" class="selected-artist-avatar" onerror="this.src=\'/img/profile.jpg\'">';
                 html += '<div class="selected-artist-name">' + escapeHtml(artist.artistName) + '</div>';
                 html += '<div class="remove-selected-artist" title="移除">&times;</div>';
@@ -870,8 +880,8 @@
 
         // 点击"已选艺人"区域的 × 移除艺人
         $(document).on('click', '.remove-selected-artist', function () {
-            const artistId = $(this).closest('.selected-artist-card').data('artist-id');
-            selectedArtists = selectedArtists.filter(a => a.artistId !== artistId);
+            const artistId = artistIdStr($(this).closest('.selected-artist-card').attr('data-artist-id'));
+            selectedArtists = selectedArtists.filter(a => !sameArtistId(a.artistId, artistId));
             updateSelectedArtistsView();
             // 同步取消搜索列表中对应的选中状态
             const item = $('#modal-artist-list .modal-artist-item[data-artist-id="' + artistId + '"]');
@@ -962,7 +972,7 @@
             // 根据当前显示顺序计算 sort：越靠前的 sort 值越大
             const total = selectedArtists.length;
             const artistOrders = selectedArtists.map((a, index) => ({
-                artistId: a.artistId,
+                artistId: artistIdStr(a.artistId),
                 sort: total - index   // 第 0 位 → sort 最大
             }));
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinArtistPerformanceServiceImpl.java

@@ -144,7 +144,7 @@ public class KylinArtistPerformanceServiceImpl extends ServiceImpl<KylinArtistPe
         
         if (artistOrders != null && !artistOrders.isEmpty()) {
             for (Map<String, Object> item : artistOrders) {
-                String artistId = (String) item.get("artistId");
+                String artistId = toArtistId(item.get("artistId"));
                 if (artistId != null) {
                     affectedArtistIds.add(artistId);
                 }
@@ -166,7 +166,10 @@ public class KylinArtistPerformanceServiceImpl extends ServiceImpl<KylinArtistPe
         // 2. 按前端传入的顺序重新关联，sort 越大越靠前
         if (artistOrders != null && !artistOrders.isEmpty()) {
             for (Map<String, Object> item : artistOrders) {
-                String artistId = (String) item.get("artistId");
+                String artistId = toArtistId(item.get("artistId"));
+                if (artistId == null) {
+                    continue;
+                }
                 Integer sort = item.get("sort") != null
                         ? Integer.parseInt(item.get("sort").toString()) : 0;
 
@@ -197,4 +200,13 @@ public class KylinArtistPerformanceServiceImpl extends ServiceImpl<KylinArtistPe
         }
         return true;
     }
+
+    /** 兼容老自增 ID（JSON 可能是 Number）与雪花 ID（String） */
+    private String toArtistId(Object artistId) {
+        if (artistId == null) {
+            return null;
+        }
+        String id = artistId.toString().trim();
+        return id.isEmpty() ? null : id;
+    }
 }

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -277,8 +277,8 @@ liquidnet:
     app-key: '5423d413f8349b186893892dcef6f76b'
     app-code: 'MDWH'
     public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
-    merchant-id: 'b2d63146-934f-401f-a864-14926d952c16'
-    merchant-user-id: '6d0d632e-50e9-464e-bbb3-be76047ec835'
+    merchant-id: 'c16ef8d8-1fc8-4e4e-9139-e6298a61b23a'
+    merchant-user-id: '0b778a4e-531c-449c-942e-fa7887bdc9ed'
     role: 'super_admin'
 
   secure-access:

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -275,8 +275,8 @@ liquidnet:
     app-key: '5423d413f8349b186893892dcef6f76b'
     app-code: 'MDWH'
     public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
-    merchant-id: 'b2d63146-934f-401f-a864-14926d952c16'
-    merchant-user-id: '6d0d632e-50e9-464e-bbb3-be76047ec835'
+    merchant-id: 'c16ef8d8-1fc8-4e4e-9139-e6298a61b23a'
+    merchant-user-id: '0b778a4e-531c-449c-942e-fa7887bdc9ed'
     role: 'super_admin'
 
   secure-access: