From 35b7b48dcc6825d661c67fb9b7a2ed33d9743851 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 十二月 2024 23:14:06 +0800
Subject: [PATCH] 加入手机合规性校验
---
service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
index 53ead71..0969d6b 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/QueryStorePrivilegeGroupCmd.java
@@ -7,7 +7,9 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.store.StoreDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.store.IStoreV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.service.context.DataQuery;
import com.java110.service.smo.IQueryServiceSMO;
import com.java110.utils.exception.CmdException;
@@ -28,54 +30,60 @@
@Autowired
private IQueryServiceSMO queryServiceSMOImpl;
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
String userId = context.getReqHeaders().get("user-id");
String storeId = context.getReqHeaders().get("store-id");
-
- if(StringUtil.isEmpty(userId)){
+ String communityId = context.getReqHeaders().get("communityId");
+ if (StringUtil.isEmpty(userId)) {
userId = reqJson.getString("userId");
}
+ // 鍒ゆ柇鏄笉鏄鐞嗗憳锛岀鐞嗗憳鍙嶉 鐗╀笟 鐨勬墍瑙掕壊
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
String storeTypeCd = "";
- if(!reqJson.containsKey("storeTypeCd") || StringUtil.isEmpty(reqJson.getString("storeTypeCd"))) {
-
+ if (!reqJson.containsKey("storeTypeCd") || StringUtil.isEmpty(reqJson.getString("storeTypeCd"))) {
StoreDto storeDto = new StoreDto();
storeDto.setStoreId(storeId);
storeDto.setPage(1);
storeDto.setRow(1);
List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
-
Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
storeTypeCd = storeDtos.get(0).getStoreTypeCd();
- }else{
+ } else {
storeTypeCd = reqJson.getString("storeTypeCd");
}
-
DataQuery dataQuery = new DataQuery();
dataQuery.setServiceCode("query.store.privilegeGroup");
JSONObject param = new JSONObject();
param.put("storeId", storeId);
param.put("storeTypeCd", storeTypeCd);
+ // modify by 鍚村鏂� 锛岃繖鍧楄璁℃垜鎰熻涓嶅悎鐞嗗憿锛屽鏋� 鎴戞槸鐗╀笟鍏徃绠＄悊鍛� 鎴戝垎閰嶄簡 A灏忓尯绠＄悊鍛� 寮犱笁 B灏忓尯绠＄悊鏉庡洓锛�
+ // 閭ｄ箞鏉庡洓灏辨病娉曞啀娣诲姞瑙掕壊鏉冮檺 鍥犱负浠栦滑娣诲姞鐨勬潈闄愰粯璁ゆ病鏈夊叧鑱斿皬鍖� 鎵�浠ユ樉绀轰笉鍑烘潵 鍒汉璁や负杩欎釜灏辨槸涓猙ug
+// if(!UserDto.LEVEL_CD_ADMIN.equals(userDtos.get(0).getLevelCd())){
+// param.put("communityId", communityId);
+// }
dataQuery.setRequestParams(param);
queryServiceSMOImpl.commonQueryService(dataQuery);
ResponseEntity<String> privilegeGroup = dataQuery.getResponseEntity();
if (privilegeGroup.getStatusCode() != HttpStatus.OK) {
context.setResponseEntity(privilegeGroup);
- return ;
+ return;
}
-
JSONObject privilegeGroupObj = JSONObject.parseObject(privilegeGroup.getBody().toString());
-
Assert.jsonObjectHaveKey(privilegeGroupObj, "privilegeGroups", "鏌ヨ鑿滃崟鏈繑鍥瀙rivilegeGroups鑺傜偣");
-
JSONArray privilegeGroups = privilegeGroupObj.getJSONArray("privilegeGroups");
-
context.setResponseEntity(new ResponseEntity<String>(privilegeGroups.toJSONString(), HttpStatus.OK));
}
}
--
Gitblit v1.8.0