no message

bus-biz/src/main/java/bus/mapper/BNoticeInfoMapper.java

@@ -25,5 +25,5 @@ public interface BNoticeInfoMapper extends BaseMapper<BNoticeInfoPo> {
      * @param userId 用户ID
      * @return 公告列表
      */
-    List<BNoticeInfoDto> getNoticeInfoList(@Param("userId") String userId);
+    List<BNoticeInfoDto> getNoticeInfoList();
 }

bus-biz/src/main/java/bus/service/impl/BNoticeUserServiceImpl.java

@@ -87,9 +87,9 @@ public class BNoticeUserServiceImpl extends ServiceImpl<BNoticeUserMapper,BNotic
     @Override
     public List<BNoticeInfoDto> getNoticeInfoList() {
         // 获取当前用户信息
-        ExtInfo extInfo = CurrentUserHolder.get();
-        String userId = extInfo.getUserId();
+       // ExtInfo extInfo = CurrentUserHolder.get();
+      //  String userId = extInfo.getUserId();
         // 使用SQL直接查询带有已读状态的公告列表
-        return bNoticeInfoMapper.getNoticeInfoList(userId);
+        return bNoticeInfoMapper.getNoticeInfoList();
     }
 }

bus-biz/src/main/java/bus/service/impl/BUserCourseServiceImpl.java

@@ -129,6 +129,7 @@ public class BUserCourseServiceImpl extends ServiceImpl<BUserCourseMapper,BUserC
                 trackInfo.setLastStationName(courseInfo.getLastStationName());
                 trackInfo.setFirstBusSpace(courseInfo.getFirstBusSpace());
                 trackInfo.setTicketAmount(courseInfo.getTicketAmount());
+                trackInfo.setMapPicUrl(courseInfo.getMapPicUrl());
                 // 处理路线站点信息
                 List<BCoursePointDto> stationInfoList = courseInfo.getMapPointList();
                 trackInfo.setClist(stationInfoList);

bus-biz/src/main/java/bus/service/impl/WChatUserServiceImpl.java

@@ -92,7 +92,7 @@ public class WChatUserServiceImpl implements WChatUserService {
             SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request, response, userLoginRequest);
             return ssoUserAuthDto;
         }
-
+        
         String sub = "wx@" + StrUtil.sub(mobile, mobile.length() - 6, mobile.length());
         String wxName = wxLoginReq.getWxName();
         StaffEntity staffByUserName = staffClient.getStaffByUserName(mobile, organizeId);

bus-biz/src/main/resources/mapper/BNoticeInfoMapper.xml

@@ -40,11 +40,10 @@
      a.content,
      a.type,
      a.pub_time,
-     a.status,
-     CASE WHEN b.id IS NOT NULL THEN '1' ELSE '0' END as is_read
+     a.status
    FROM 
      b_notice_info a
-     LEFT JOIN b_notice_user b ON a.id = b.notice_id AND b.user_id = #{userId}
+
    WHERE 
      a.status = '1' 
      AND a.is_delete = 0

bus-boot/src/main/resources/bootstrap-dev.yaml

@@ -45,7 +45,7 @@ orcas:
     logout:
       path: /logout
     excluded:
-      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/doc.html,/wChatUser/auto/login,/wChatUser/encryptedData,/wChatUser/getPhoneNumber,/wChatUser/getXcxOpenId
+      paths: /swagger-ui.html,/webjars/**,/swagger-resources/**,/v2/api-docs,/doc.html,/wChatUser/auto/login,/wChatUser/encryptedData,/wChatUser/getPhoneNumber,/wChatUser/getXcxOpenId,/bNoticeInfo/list,/bCourseInfo/etNearbyRoutes,/bCourseInfo/getCourseDetail,/bCourseInfo/getAllCourseByType,/bAdvert/list,/bNoticeUser/getNoticeInfoList
 
 file-store:
   go-fastdfs: