gongfuzhu 1 年間 前
コミット
0845405b4f

+ 2 - 1
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/service/XiaoJuService.java

@@ -1,6 +1,7 @@
 package com.zswl.cloud.springBatch.client.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
+import com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.response.QueryApiStorePriceResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -15,7 +16,7 @@ import java.util.List;
 public interface XiaoJuService {
     @ApiOperation("批量查询加油站详情")
     @RequestMapping(value = "queryStorePrice", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-    ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(@RequestBody List<String> storeIdList);
+    ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(@RequestBody QueryApiStorePriceRequest queryApiStorePriceRequest);
 
 
 

+ 9 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -3,10 +3,12 @@ package com.zswl.cloud.springBtach.server.core.controller;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.xiaoju.open.oil.interfaces.domain.AllowancePromotionInfo;
 import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
 import com.xiaoju.open.oil.interfaces.request.QueryApiOrderListRequest;
+import com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.request.QueryGetPromotionRequest;
 import com.xiaoju.open.oil.interfaces.response.*;
 import com.zswl.cloud.springBatch.client.model.request.*;
@@ -28,6 +30,8 @@ public class XiaoJuController {
     @Autowired
     XiaoJuServiceImpl xiaoJuService;
 
+    @Autowired
+    AuthHelper authHelper;
 
     @ApiOperation("查看附近的加油站信息")
     @ResourceAuth(value = "user", type = AuthType.User)
@@ -40,7 +44,11 @@ public class XiaoJuController {
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "queryStorePrice", method = RequestMethod.POST)
     public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(@RequestBody List<String> storeIdList) {
-        return xiaoJuService.queryStorePrice(storeIdList);
+
+        QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
+        queryApiStorePriceRequest.setStoreIds(storeIdList);
+        queryApiStorePriceRequest.setOutUserId(authHelper.getCurrentUser().getUserId());
+        return xiaoJuService.queryStorePrice(queryApiStorePriceRequest);
     }
 
     @ApiOperation("查看加油站详情")

+ 1 - 5
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/XiaoJuServiceImpl.java

@@ -275,12 +275,8 @@ public class XiaoJuServiceImpl implements XiaoJuService {
 
     }
 
-    public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(List<String> storeIdList) {
-        String userId = authHelper.getCurrentUser().getUserId();
-        QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
+    public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(QueryApiStorePriceRequest queryApiStorePriceRequest) {
         queryApiStorePriceRequest.setOpenChannel(1);
-        queryApiStorePriceRequest.setOutUserId(userId);
-        queryApiStorePriceRequest.setStoreIds(storeIdList);
 
 
         QueryClient queryClient = QueryClientFactory.create(oilConfig);