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

朋友圈门店分组

See merge request !3079

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

@@ -372,6 +372,13 @@ public class GroupChatPlanController {
         if (!resp.isSuccess()) {
             return RestResponse.failure("1", "活动不存在");
         }
+        if(CollectionUtils.isNotEmpty(resp.getResult().getResult())) {
+            for (GroupChatPlanOwnerLogDTO log : resp.getResult().getResult()) {
+                if(org.apache.commons.lang.StringUtils.isNotBlank(log.getStoreGroupName()) && log.getStoreGroupName().contains("/")) {
+                    log.setStoreGroupName(log.getStoreGroupName().split("/")[log.getStoreGroupName().split("/").length-1]) ;
+                }
+            }
+        }
         return RestResponse.successResult(resp.getResult());
     }
 
@@ -392,6 +399,13 @@ public class GroupChatPlanController {
         if (!resp.isSuccess()) {
             return RestResponse.failure("1", "活动不存在");
         }
+        if(CollectionUtils.isNotEmpty(resp.getResult().getResult())) {
+            for (GroupChatPlanLogDTO log : resp.getResult().getResult()) {
+                if(org.apache.commons.lang.StringUtils.isNotBlank(log.getStoreGroupName()) && log.getStoreGroupName().contains("/")) {
+                    log.setStoreGroupName(log.getStoreGroupName().split("/")[log.getStoreGroupName().split("/").length-1]) ;
+                }
+            }
+        }
         return RestResponse.successResult(resp.getResult());
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/moment/QwMomentPlanAttendVO.java

 package com.gic.haoban.manage.web.vo.moment;
 
+import org.apache.commons.lang.StringUtils;
+
 import java.io.Serializable ;
 import java.util.Date;
 
@@ -59,6 +61,9 @@ public class QwMomentPlanAttendVO implements Serializable{
 	private String reason ;
 
 	public String getStoreGroupName() {
+		if(StringUtils.isNotBlank(storeGroupName) && storeGroupName.contains("/")) {
+			storeGroupName = storeGroupName.split("/")[storeGroupName.split("/").length-1] ;
+		}
 		return storeGroupName;
 	}
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/moment/QwMomentPlanDataVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.gic.web.common.jsonSeralizer.CardNoJsonSeralizer;
 import com.gic.web.common.jsonSeralizer.PhoneNumberJsonSeralizer;
 import com.gic.web.common.jsonSeralizer.UserNameJsonSeralizer;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable ;
 import java.util.Date;
@@ -75,6 +76,9 @@ public class QwMomentPlanDataVO implements Serializable{
 	private String storeGroupId ;
 
 	public String getStoreGroupName() {
+		if(StringUtils.isNotBlank(storeGroupName) && storeGroupName.contains("/")) {
+			storeGroupName = storeGroupName.split("/")[storeGroupName.split("/").length-1] ;
+		}
 		return storeGroupName;
 	}