From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单
---
service-user/src/main/java/com/java110/user/cmd/user/QueryUserPrivilege.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 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 fdda3cd..b1acf6d 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,29 @@
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");
+ }
+ String domain = "";
+ if(!reqJson.containsKey("domain") || StringUtil.isEmpty(reqJson.getString("domain"))) {
- Assert.listOnlyOne(storeDtos, "鍟嗘埛涓嶅瓨鍦�");
+ 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