fix

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/service/XiaoJuService.java

@@ -12,15 +12,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(name = "springbatchservice/manager/xiaoju")
 public interface XiaoJuService {
-    @ApiOperation("批量查询加油站详情")
+    @ApiOperation("批量查询加油站价格")
     @RequestMapping(value = "queryStorePrice", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
     ResultContent<List<StorePriceInfo>> queryStorePrice(@RequestBody QueryApiStorePriceRequest queryApiStorePriceRequest);
 
 
 
+    @ApiOperation("加油站详情")
+    @RequestMapping(value = "storeInfo", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ResultContent<Map<String,String>> storeInfo(@RequestBody QueryApiStorePriceRequest queryApiStorePriceRequest);
+
+
+
 
 
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/XiaoJuServiceImpl.java

@@ -42,7 +42,9 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Log4j2
 @Service
@@ -72,7 +74,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
     @Autowired
     private OrderService2 orderService2;
 
-    // 查询加油站详情
+    // 同步加油站
     public ResponseDTO notificationPushStoreInfoRequest(OilRequest oilRequest) {
 
         TripartiteShopDto tripartiteShopDto = new TripartiteShopDto();
@@ -297,6 +299,24 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         }
     }
 
+    @Override
+    public ResultContent<Map<String, String>> storeInfo(QueryApiStorePriceRequest queryApiStorePriceRequest) {
+        HashMap<String, String> stringStringHashMap = new HashMap<>();
+        ResultContent<List<StorePriceInfo>> listResultContent = queryStorePrice(queryApiStorePriceRequest);
+        for (StorePriceInfo storePriceInfo : listResultContent.getContent()) {
+            XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storePriceInfo.getStoreId());
+            JSONObject entries = JSONUtil.parseObj(byStoreId);
+            List<ItemPriceInfo> itemInfoList = storePriceInfo.getItemInfoList();
+            entries.put("itemInfoList",itemInfoList);
+
+            stringStringHashMap.put(storePriceInfo.getStoreId(),itemInfoList.toString());
+
+        }
+
+
+        return ResultContent.buildContent(stringStringHashMap);
+    }
+
 
     public ResultContent<List<XiaoJuStoreModel>> nearbyStore(NearbyModel nearbyModel) {