Merge branch 'feature/xgh/202506迭代' into 'developer'

Feature/xgh/202506迭代

See merge request !3048

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanAttendServiceImpl.java

@@ -79,6 +79,9 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         // 0已失效 1待完成 2已完成
         Integer sendStatus = qdto.getSendStatus() ;
         TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(qdto.getPlanId()) ;
+        if(null == plan) {
+            return ServiceResponse.failure("9999","活动不存在") ;
+        }
         boolean isEnd = plan.getStatusFlag()==2 || plan.getEndDate().getTime() <= System.currentTimeMillis() ;
         if(null != sendStatus && isEnd && sendStatus==1) {
             return ServiceResponse.success(new Page<>());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -320,7 +320,7 @@ public class GroupChatHmController {
                     if(null != storeDTO) {
                         vo.setStoreName(storeDTO.getStoreName());
                         vo.setStoreCode(storeDTO.getStoreCode());
-                        if(null != storeDTO.getStatus() && storeDTO.getStatus()!=0) {
+                        if(null != storeDTO.getStatus() && storeDTO.getStatus()!=0 && storeDTO.getStatus()!=-3) {
                             vo.setStoreStatus(1);
                         }
                     }