feat: 好办权限初始化

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/content/InteractRecordApiService.java

@@ -23,6 +23,7 @@ public interface InteractRecordApiService {
 
     /**
      * 处理member信息变化的MQ
+     * routeName:  memberIdChangeNotify
      * @param params
      * @return
      */

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -529,11 +529,18 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                 if (CollectionUtils.isEmpty(hasExistMenuCodes)) {
                     hasExistMenuCodes = new ArrayList<>();
                 }
-                List<String> finalHasExistMenuCodes = hasExistMenuCodes;
+                List<String> excludeMenuCodes = hasExistMenuCodes;
+                if (!hasExistMenuCodes.contains("commodityCenter")) {
+                    // 如果该角色原来没有【商品中心权限】 不勾选发圈素材和素材数量
+                    logger.info("roleId:{} 原本没有商品中心权限 ", haobanRoleBO.getRoleId());
+                    excludeMenuCodes.add("goodsDetail_material");
+                    excludeMenuCodes.add("goodsCenter_Count");
+                }
                 List<TabHaobanRoleMenu> tabHaobanRoleMenus = menuCodes.stream()
-                        .filter(item -> !finalHasExistMenuCodes.contains(item))
+                        .filter(item -> !excludeMenuCodes.contains(item))
                         .map(item -> {
                             TabHaobanRoleMenu temp = new TabHaobanRoleMenu();
+                            temp.setRoleMenuId(UniqueIdUtils.uniqueLong());
                             temp.setRoleId(haobanRoleBO.getRoleId());
                             temp.setWxEnterpriseId(wxEnterpriseId);
                             temp.setStatusFlag(1);
@@ -543,9 +550,10 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
                             return temp;
                         })
                         .collect(Collectors.toList());
+                logger.info("企微:{} roleId:{} 新增权限code: {}", wxEnterpriseId, haobanRoleBO.getRoleId(), JSON.toJSONString(tabHaobanRoleMenus));
                 haobanRoleMenus.addAll(tabHaobanRoleMenus);
             }
-            logger.info("新增权限code: {}", JSON.toJSONString(haobanRoleMenus));
+            logger.info("企微:{} 新增权限code: {}", wxEnterpriseId, JSON.toJSONString(haobanRoleMenus));
             if (CollectionUtils.isNotEmpty(haobanRoleMenus)) {
                 haobanRoleMenuService.insertBatch(haobanRoleMenus);
             }
@@ -557,15 +565,15 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
 
     static {
         // 导购
-        menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "goodsDetail_material", "goodsCenter_Count"));
-        menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain","goodsDetail_material", "goodsCenter_Count", "salesClue", "customerDetail_interact"));
+        menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count"));
+        menuCodeMap.put("0" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain","materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "salesClue", "customerDetail_interact"));
         // 店长
-        menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
-        menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "goodsDetail_material", "goodsCenter_Count", "materialManage", "salesClue", "customerDetail_interact"));
+        menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
+        menuCodeMap.put("1" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage", "salesClue", "customerDetail_interact"));
 
         // 区经
-        menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
-        menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
+        menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
+        menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
     }
 
 

haoban-manage3-service/src/test/java/ChatTest.java

 import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
 import com.gic.haoban.manage.api.dto.notify.qdto.NoticeMessageQDTO;
@@ -47,4 +48,10 @@ public class ChatTest {
         groupChatPlanService.save(groupChatPlanDTO);
     }
 
+    @Test
+    public void sendMessageTest() throws Exception {
+        String params = "{\"enterpriseId\":\"ff8080815dacd3a2015dacd3ef5c0000\",\"memberId\":\"ff80808187732d6001877333a8030000\",\"opt\":1,\"unionId\":\"orXl9t70uwsdD7kqjNmWu03nKSCg\"}";
+        GICMQClientUtil.getClientInstance().sendMessage("memberIdChangeNotify", params);
+    }
+
 }

haoban-manage3-service/src/test/java/RoleTest.java

+import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.GICMQClientUtil;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.role.ContentMaterialROleInitQDTO;
+import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
+import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class RoleTest {
+
+    @Autowired
+    HaobanRoleApiService haobanRoleApiService;
+
+    @Test
+    public void initTest(){
+        ContentMaterialROleInitQDTO initQDTO = new ContentMaterialROleInitQDTO();
+        initQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+        initQDTO.setVersion(2);
+        haobanRoleApiService.contentMaterialRoleInit(initQDTO);
+    }
+}