测试多个DTO传值

gic-store-api/src/main/java/com/gic/store/dto/open/StoreOpenDTO.java

@@ -93,6 +93,12 @@ public class StoreOpenDTO implements Serializable {
 
     /**
      * 扩展字段
+     * [
+     * {
+     *     "fieldCode":"",
+     *     "fieldValue"""
+     * }
+     * ]
      */
     private String customField;
 

gic-store-api/src/main/java/com/gic/store/service/StoreOpenApiService.java

@@ -29,12 +29,13 @@ public interface StoreOpenApiService {
      * @Title: getStoreDetail

      * @Description:
     
* @author guojuxing
+     * @param appId
      * @param enterpriseId 商户ID
      * @param storeCode 门店代码
      * @param regionId
门店域ID
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

     
*/
-    ServiceResponse<String> getStoreDetail(Integer enterpriseId, String storeCode, Integer regionId);
+    ServiceResponse<String> getStoreDetail(String appId, Integer enterpriseId, String storeCode, Integer regionId);
 
     /**
      * 门店新增接口
@@ -79,17 +80,18 @@ public interface StoreOpenApiService {
      * @Title: getClerkDetail

      * @Description:
     
* @author guojuxing
+     * @param appId
      * @param enterpriseId 商户ID
      * @param storeCode 门店code
      * @param clerkCode 导购code
      * @param regionId
门店域ID
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

     
*/
-    ServiceResponse<String> getClerkDetail(Integer enterpriseId, String storeCode, String clerkCode, Integer regionId);
+    ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, String storeCode, String clerkCode, Integer regionId);
 
-    ServiceResponse<Void> addClerk(Integer enterpriseId, ClerkDTO clerkInfo);
+    ServiceResponse<Void> addClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo);
 
-    ServiceResponse<Void> editClerk(Integer enterpriseId, ClerkDTO clerkInfo);
+    ServiceResponse<Void> editClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo);
 
     /**
      * 分页查询导购列表
@@ -104,5 +106,5 @@ public interface StoreOpenApiService {
      * @param pageSize
每页多少条
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

     
*/
-    ServiceResponse<String> pageClerk(Long appId, Integer enterpriseId, String storeCode, Integer regionId, Integer pageNum, Integer pageSize);
+    ServiceResponse<String> pageClerk(String appId, Integer enterpriseId, String storeCode, Integer regionId, Integer pageNum, Integer pageSize);
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java

@@ -95,8 +95,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     }
 
     @Override
-    @GatewayParams(query = {"enterpriseId", "storeCode", "regionId"})
-    public ServiceResponse<String> getStoreDetail(Integer enterpriseId, String storeCode, Integer regionId) {
+    @GatewayParams(query = {"appId", "enterpriseId", "storeCode", "regionId"})
+    public ServiceResponse<String> getStoreDetail(String appId, Integer enterpriseId, String storeCode, Integer regionId) {
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
@@ -352,8 +352,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     }
 
     @Override
-    @GatewayParams(query = {"enterpriseId", "storeCode", "clerkCode", "regionId"})
-    public ServiceResponse<String> getClerkDetail(Integer enterpriseId, String storeCode, String clerkCode, Integer regionId) {
+    @GatewayParams(query = {"appId", "enterpriseId", "storeCode", "clerkCode", "regionId"})
+    public ServiceResponse<String> getClerkDetail(String appId, Integer enterpriseId, String storeCode, String clerkCode, Integer regionId) {
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
@@ -383,8 +383,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     }
 
     @Override
-    @GatewayParams(query = {"enterpriseId"}, body = {"clerkInfo"})
-    public ServiceResponse<Void> addClerk(Integer enterpriseId, ClerkDTO clerkInfo) {
+    @GatewayParams(query = { "appId", "enterpriseId"}, body = {"clerkInfo"})
+    public ServiceResponse<Void> addClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo) {
         LOGGER.info("对外API新增导购参数:{}", JSON.toJSONString(clerkInfo));
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
@@ -431,8 +431,8 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
     }
 
     @Override
-    @GatewayParams(query = {"enterpriseId"}, body = {"clerkInfo"})
-    public ServiceResponse<Void> editClerk(Integer enterpriseId, ClerkDTO clerkInfo) {
+    @GatewayParams(query = { "appId", "enterpriseId"}, body = {"clerkInfo"})
+    public ServiceResponse<Void> editClerk(String appId, Integer enterpriseId, ClerkDTO clerkInfo) {
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
@@ -485,16 +485,12 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
 
     @Override
     @GatewayParams(query = {"appId", "enterpriseId", "storeCode", "regionId", "pageNum", "pageSize"})
-    public ServiceResponse<String> pageClerk(Long appId, Integer enterpriseId, String storeCode, Integer regionId, Integer pageNum, Integer pageSize) {
+    public ServiceResponse<String> pageClerk(String appId, Integer enterpriseId, String storeCode, Integer regionId, Integer pageNum, Integer pageSize) {
         //参数校验
         ServiceResponse<EnterpriseDTO> enterpriseResult = enterpriseApiService.getEnterpriseById(enterpriseId);
         if (!enterpriseResult.isSuccess()) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID错误，无此商户");
         }
-        ServiceResponse<ApplicationResourceDTO> res = authorizeService.findResourceByEnterpriseIdAndApplicationId(Long.valueOf(enterpriseId), appId);
-        if (res.isSuccess()) {
-            return ServiceResponse.failure(res.getCode(), res.getMessage());
-        }
         if (pageNum == null) {
             pageNum = 1;
         }