From eae32ec1efe2774e2cd945cc45e9cf4878828459 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 四月 2023 00:18:00 +0800
Subject: [PATCH] 优化 直接验证码登录时 创建 业主资料
---
service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
index a04da9e..5eb4c42 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java
@@ -31,10 +31,13 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String userId = context.getReqHeaders().get("user-id");
- String storeId = context.getReqHeaders().get("store-id");
+ //String storeId = context.getReqHeaders().get("store-id");
+
+ if(StringUtil.isEmpty(userId)){
+ userId = reqJson.getString("userId");
+ }
Assert.hasLength(userId, "鏈寘鍚敤鎴�");
- Assert.hasLength(storeId, "鏈寘鍚晢鎴�");
}
@Override
@@ -43,19 +46,34 @@
String userId = context.getReqHeaders().get("user-id");
String storeId = context.getReqHeaders().get("store-id");
- StoreDto storeDto = new StoreDto();
- storeDto.setStoreId(storeId);
- storeDto.setPage(1);
- storeDto.setRow(1);
- List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+ if(StringUtil.isEmpty(userId)){
+ userId = reqJson.getString("userId");
+ }
- Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+ if(reqJson.containsKey("staffId") && !StringUtil.isEmpty(reqJson.getString("staffId"))){
+ userId = reqJson.getString("staffId");
+ }
+
+ String domain = "";
+ if(!reqJson.containsKey("domain") || StringUtil.isEmpty(reqJson.getString("domain"))) {
+
+ StoreDto storeDto = new StoreDto();
+ storeDto.setStoreId(storeId);
+ storeDto.setPage(1);
+ storeDto.setRow(1);
+ List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+
+ Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+ domain = storeDtos.get(0).getStoreTypeCd();
+ }else{
+ domain = reqJson.getString("domain");
+ }
DataQuery dataQuery = new DataQuery();
dataQuery.setServiceCode("query.user.privilege");
JSONObject param = new JSONObject();
param.put("userId", userId);
- param.put("domain", storeDtos.get(0).getStoreTypeCd());
+ param.put("domain", domain);
dataQuery.setRequestParams(param);
queryServiceSMOImpl.commonQueryService(dataQuery);
ResponseEntity<String> privilegeGroup = dataQuery.getResponseEntity();
--
Gitblit v1.8.0