Merge branch 'sit' into uat-20260202

alien-entity/src/main/java/shop/alien/mapper/StoreCommentAppealMapper.java

@@ -124,4 +124,12 @@ public interface StoreCommentAppealMapper extends BaseMapper<StoreCommentAppeal>
     void updateByRecordId(@Param("recordId") Integer recordId,
                           @Param("appealStatus") Integer appealStatus,
                           @Param("finalResult") String finalResult);
+
+
+    @Update("UPDATE store_comment_appeal " +
+            "SET appeal_status = #{appealStatus}, final_result = #{finalResult} " +
+            "WHERE id = #{id}")
+    void updateByRecordIdNew(@Param("id") Integer id,
+                          @Param("appealStatus") Integer appealStatus,
+                          @Param("finalResult") String finalResult);
 }

alien-store/src/main/java/shop/alien/store/service/StoreCommentAppealSupplementJobService.java

@@ -160,7 +160,7 @@ public class StoreCommentAppealSupplementJobService {
                     log.info("【用户补充申诉】用户赢，申诉驳回，申诉ID: {}", appeal.getId());
                 }
 
-                storeCommentAppealMapper.updateByRecordId(appeal.getRecordId(),
+                storeCommentAppealMapper.updateByRecordIdNew(appeal.getId(),
                         updateAppeal.getAppealStatus(), updateAppeal.getFinalResult());
                 boolean merchantWins = merchantConfidence > userConfidence;
                 sendAppealResultNotifications(appeal, merchantWins);
@@ -198,7 +198,10 @@ public class StoreCommentAppealSupplementJobService {
             contextJson.put("message", message);
             contextJson.put("appealId", appeal.getId());
             contextJson.put("commentId", appeal.getCommentId());
-            insertSystemNotice(receiverId, appeal.getId(), "商家申诉通知", contextJson.toJSONString());
+            String title = merchantWins
+                    ? "您的评价已被删除"
+                    : "商家申诉已被驳回";
+            insertSystemNotice(receiverId, appeal.getId(), title, contextJson.toJSONString());
             log.info("【用户补充申诉】用户申诉结果通知发送成功，appealId={}, merchantWins={}", appeal.getId(), merchantWins);
         } catch (Exception e) {
             log.error("【用户补充申诉】用户申诉结果通知发送失败，appealId={}", appeal.getId(), e);