调整添加默认权限

Api/src/main/java/com/java110/api/listener/store/SaveStoreServiceListener.java

@@ -145,6 +145,7 @@ public class SaveStoreServiceListener extends AbstractServiceApiDataFlowListener
         JSONObject paramInObj = new JSONObject();
         paramInObj.put("userId",paramObj.getJSONObject("businessStore").getString("userId"));
         paramInObj.put("storeTypeCd",paramObj.getJSONObject("businessStore").getString("storeTypeCd"));
+        paramInObj.put("userFlag","admin");
         HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
         doRequest(dataFlowContext,appService,httpEntity);
         responseEntity = dataFlowContext.getResponseEntity();

Api/src/main/java/com/java110/api/listener/users/AddStaffServiceListener.java

@@ -189,6 +189,7 @@ public class AddStaffServiceListener extends AbstractServiceApiDataFlowListener{
         JSONObject paramInObj = new JSONObject();
         paramInObj.put("userId",paramObj.getString("userId"));
         paramInObj.put("storeTypeCd",paramObj.getString("storeTypeCd"));
+        paramInObj.put("userFlag","staff");
         HttpEntity<String> httpEntity = new HttpEntity<String>(paramInObj.toJSONString(), header);
         doRequest(dataFlowContext,appService,httpEntity);
         responseEntity = dataFlowContext.getResponseEntity();

OrderService/src/main/java/com/java110/order/smo/impl/PrivilegeSMOImpl.java

@@ -35,12 +35,17 @@ public class PrivilegeSMOImpl implements IPrivilegeSMO {
 
         Assert.jsonObjectHaveKey(privilegeInfo,"storeTypeCd","请求报文中未包含storeTypeCd节点");
 
+        Assert.jsonObjectHaveKey(privilegeInfo,"userFlag","请求报文中未包含userFlag节点");
+
 
         JSONObject privilegeObj = JSONObject.parseObject(privilegeInfo);
 
         String storeTypeCd = privilegeObj.getString("storeTypeCd");
 
-        String defaultPrivilege = MappingCache.getValue(MappingConstant.DOMAIN_DEFAULT_PRIVILEGE_ADMIN,storeTypeCd);
+        String privilegeDomain = "admin".equals(privilegeObj.getString("userFlag"))
+                ?MappingConstant.DOMAIN_DEFAULT_PRIVILEGE_ADMIN:MappingConstant.DOMAIN_DEFAULT_PRIVILEGE;
+
+        String defaultPrivilege = MappingCache.getValue(privilegeDomain,storeTypeCd);
 
         Assert.hasLength(defaultPrivilege,"在c_mapping 表中未配置商户类型为"+storeTypeCd+" 的默认权限组");
         privilegeObj.put("pId",defaultPrivilege);

java110-common/src/main/java/com/java110/common/constant/MappingConstant.java

@@ -99,5 +99,12 @@ public class MappingConstant {
     public final static String DOMAIN_DEFAULT_PRIVILEGE_ADMIN = "DEFAULT_PRIVILEGE_ADMIN";
 
 
+    /**
+     * 默认权限
+     */
+    public final static String DOMAIN_DEFAULT_PRIVILEGE = "DEFAULT_PRIVILEGE";
+
+
+
 
 }