From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
index 7de8b3b..4f06bbb 100644
--- a/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/menu/ListCatalogMenusCmd.java
@@ -21,18 +21,21 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.language.Language;
import com.java110.dto.menuGroup.MenuGroupDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.IMenuCatalogV1InnerServiceSMO;
+import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import java.util.List;
@@ -65,7 +68,7 @@
Assert.hasKeyAndValue(reqJson, "userId", "鏈寘鍚敤鎴蜂俊鎭�");
Assert.hasKeyAndValue(reqJson, "storeId", "鏈寘鍚晢鎴蜂俊鎭�");
- Assert.hasKeyAndValue(reqJson, "caId", "鏈寘鍚洰褰曚俊鎭�");
+ //Assert.hasKeyAndValue(reqJson, "caId", "鏈寘鍚洰褰曚俊鎭�");
}
@Override
@@ -73,6 +76,7 @@
MenuGroupDto menuCatalogDto = BeanConvertUtil.covertBean(reqJson, MenuGroupDto.class);
menuCatalogDto.setGroupType(MenuGroupDto.GROUP_TYPE_PC);
+ //鍒ゆ柇鏄惁 涓� 寮�鍙戞垨鑰呰繍钀ワ紝濡傛灉鏄紑鍙戞垨鑰呰繍钀ユ椂 鍙栨秷 灏忓尯ID
//鏌ヨstore 淇℃伅
StoreDto storeDto = new StoreDto();
@@ -81,10 +85,22 @@
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+ if (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd()) || StoreDto.STORE_TYPE_DEV.equals(storeDtos.get(0).getStoreTypeCd())) {
+ menuCatalogDto.setCommunityId("");
+ }
+
menuCatalogDto.setDomain(storeDtos.get(0).getStoreTypeCd());
menuCatalogDto.setStoreType(storeDtos.get(0).getStoreTypeCd());
List<Map> menus = menuCatalogV1InnerServiceSMOImpl.queryMenus(menuCatalogDto);
+ String lang = cmdDataFlowContext.getReqHeaders().get(CommonConstant.JAVA110_LANG);
+ if (!StringUtil.isEmpty(lang) && !CommonConstant.LANG_ZH_CN.equals(lang)) {
+ Language language = ApplicationContextFactory.getBean(lang, Language.class);
+ if (language != null) {
+ menus = language.getMenuDto(menus);
+ }
+
+ }
cmdDataFlowContext.setResponseEntity(refreshMenusInfo(menus));
}
@@ -109,6 +125,7 @@
//鑾峰彇瀛╁瓙鑿滃崟
JSONArray childs = tempMenu.getJSONArray("childs");
JSONObject childMenu = new JSONObject();
+ childMenu.put("mId", tMenu.getString("mId"));
childMenu.put("name", tMenu.getString("menuName"));
childMenu.put("href", tMenu.getString("url"));
childMenu.put("seq", tMenu.getString("menuSeq"));
--
Gitblit v1.8.0