优化代码将登陆ID 修改为loginUserId

java110-bean/src/main/java/com/java110/entity/component/ComponentValidateResult.java

@@ -18,11 +18,14 @@ public class ComponentValidateResult {
         this.storeTypeCd = storeTypeCd;
         this.communityId = communityId;
         this.userId = userId;
+        this.loginUserId = userId;
         this.userName = userName;
     }
 
     private String userId;
 
+    private String loginUserId;
+
     private String userName;
 
     //商户ID
@@ -73,4 +76,12 @@ public class ComponentValidateResult {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    public String getLoginUserId() {
+        return loginUserId;
+    }
+
+    public void setLoginUserId(String loginUserId) {
+        this.loginUserId = loginUserId;
+    }
 }

java110-utils/src/main/java/com/java110/utils/constant/CommonConstant.java

@@ -158,6 +158,7 @@ public class CommonConstant {
     public static final String TRANSACTION_ID = "transaction-id";
     public static final String REQUEST_TIME = "req-time";
     public static final String USER_ID = "user-id";
+    public static final String LOGIN_U_ID = "login-user-id";
     public static final String STORE_ID = "store-id";
 
     public final static String HTTP_SERVICE_API = "API";

service-api/src/main/java/com/java110/api/listener/system/CmdListener.java

@@ -54,6 +54,10 @@ public class CmdListener extends AbstractServiceApiListener {
                 && (!reqJson.containsKey("userId") || StringUtil.isEmpty(reqJson.getString("userId")))) {
             reqJson.put("userId", reqHeader.get(CommonConstant.USER_ID));
         }
+        if (reqHeader.containsKey(CommonConstant.USER_ID)
+                && (!reqJson.containsKey("loginUserId") || StringUtil.isEmpty(reqJson.getString("loginUserId")))) {
+            reqJson.put("loginUserId", reqHeader.get(CommonConstant.LOGIN_U_ID));
+        }
         if (reqHeader.containsKey(CommonConstant.STORE_ID)
                 && (!reqJson.containsKey("storeId") || StringUtil.isEmpty(reqJson.getString("storeId")))) {
             reqJson.put("storeId", reqHeader.get(CommonConstant.STORE_ID));

service-api/src/main/java/com/java110/api/smo/api/impl/ApiSMOImpl.java

@@ -86,11 +86,12 @@ public class ApiSMOImpl extends DefaultAbstractComponentSMO implements IApiSMO {
 
 
         ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
-        if (!StringUtil.isEmpty(result.getUserId())) {
+        if (!StringUtil.isEmpty(result.getLoginUserId())) {
             headers.remove("user-id");
             headers.remove("user_id");
             headers.put("user-id", result.getUserId());
             headers.put("user_id", result.getUserId());
+            headers.put("login-user-id",result.getLoginUserId());
             if (!StringUtil.isEmpty(result.getUserName())) {
                 headers.put("user-name", URLEncoder.encode(result.getUserName(), "UTF-8"));
             }

service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java

@@ -89,7 +89,7 @@ public class QueryRoomsCmd extends AbstractServiceCmdListener {
         List<RoomDto> roomDtoList = null;
         if (total > 0) {
             roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
-            refreshRoomOwners(reqJson.getString("userId"), reqJson.getString("communityId"), roomDtoList);
+            refreshRoomOwners(reqJson.getString("loginUserId"), reqJson.getString("communityId"), roomDtoList);
         } else {
             roomDtoList = new ArrayList<>();
         }

service-fee/src/main/java/com/java110/fee/cmd/fee/ListRoomsWhereFeeSetCmd.java

@@ -73,7 +73,7 @@ public class ListRoomsWhereFeeSetCmd extends AbstractServiceCmdListener {
             List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
             //获取手机号、身份证号加密标识
             String flag = reqJson.getString("flag");
-            refreshRoomOwners(reqJson.getString("userId"), reqJson.getString("communityId"), roomDtoList, flag);
+            refreshRoomOwners(reqJson.getString("loginUserId"), reqJson.getString("communityId"), roomDtoList, flag);
 
             apiRoomVo.setRooms(BeanConvertUtil.covertBeanList(roomDtoList, ApiRoomDataVo.class));
         } else {