加油站通知

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/XiaoJuApi2.java

@@ -10,6 +10,8 @@ import com.xiaoju.open.oil.interfaces.domain.CalBatchPriceItemInfo;
 import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
 import com.xiaoju.open.oil.interfaces.request.*;
 import com.xiaoju.open.oil.interfaces.response.*;
+import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
+import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -22,9 +24,12 @@ public class XiaoJuApi2 {
 
 
 
-//    @Autowired
+    @Autowired
     OilConfig oilConfig;
 
+    @Autowired
+    XiaoJuStoreDao xiaoJuStoreDao;
+
     // 查询门店详情
     public void queryStoreDetail() {
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -1,7 +1,9 @@
 package com.zswl.cloud.springBtach.server.core.controller;
 
+import com.github.microservice.auth.client.content.ResultContent;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
+import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
 import com.zswl.cloud.springBtach.server.core.service.XiaoJuService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -25,6 +27,12 @@ public class XiaoJuController {
 
         return xiaoJuService.notificationPushStoreInfoRequest(notificationPushStoreInfoRequest);
     }
+    @ApiOperation("查看加油站详情")
+    @RequestMapping(value = "queryStoreDetail", method = RequestMethod.POST)
+    public ResultContent<QueryStoreDetailResponse> queryStoreDetail(String storeId) {
+
+        return xiaoJuService.queryStoreDetail(storeId);
+    }
 
 
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/domain/XiaoJuStore.java

@@ -1,12 +1,11 @@
 package com.zswl.cloud.springBtach.server.core.domain;
 
-import cn.hutool.json.JSONObject;
+import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
+import com.xiaoju.open.oil.interfaces.domain.ItemPriceInfoForCallback;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
-import org.bson.json.JsonObject;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
@@ -36,5 +35,5 @@ public class XiaoJuStore  extends SuperEntity{
     private Integer status;
     private Integer invoiceManner;
     private List<String> marketTags;
-    private JSONObject itemInfoList;
+    private List<ItemPriceInfoForCallback> itemInfoList;
 }

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

@@ -2,6 +2,7 @@ package com.zswl.cloud.springBtach.server.core.service;
 
 
 import cn.hutool.json.JSONUtil;
+import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.xiaoju.open.oil.commons.config.OilConfig;
 import com.xiaoju.open.oil.core.QueryClient;
@@ -12,6 +13,8 @@ import com.xiaoju.open.oil.interfaces.request.QueryStoreDetailRequest;
 import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
 import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -20,6 +23,7 @@ import org.springframework.stereotype.Service;
 public class XiaoJuService {
 
 
+    private static final Logger log = LoggerFactory.getLogger(XiaoJuService.class);
     @Autowired
     AuthHelper authHelper;
 
@@ -29,51 +33,46 @@ public class XiaoJuService {
     @Autowired
     OilConfig oilConfig;
 
-    public QueryStoreDetailResponse queryStoreDetail(String storeId) {
-        XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storeId);
-        QueryStoreDetailRequest queryStoreDetailRequest = new QueryStoreDetailRequest();
-
-        queryStoreDetailRequest.setOutUserId(authHelper.getCurrentUser().getUserId());
-        queryStoreDetailRequest.setStoreId(storeId);
-        queryStoreDetailRequest.setLat(byStoreId.getLat());
-        queryStoreDetailRequest.setLon(byStoreId.getLon());
-        queryStoreDetailRequest.setOpenChannel(1);
-
-        QueryClient queryClient = QueryClientFactory.create(oilConfig);
-
-        QueryStoreDetailResponse queryStoreDetailResponse = queryClient.api().queryStoreDetail(queryStoreDetailRequest);
-
-        return queryStoreDetailResponse;
-    }
-
-
-
-
-
+    // 查询加油站详情
     public ResponseDTO notificationPushStoreInfoRequest(NotificationPushStoreInfoRequest notificationPushStoreInfoRequest){
 
+        log.info("通知 加油站详情：{}", JSONUtil.toJsonStr(notificationPushStoreInfoRequest));
         XiaoJuStore xiaoJuStore = new XiaoJuStore();
         BeanUtils.copyProperties(notificationPushStoreInfoRequest, xiaoJuStore);
-        xiaoJuStore.setItemInfoList(JSONUtil.parseObj(notificationPushStoreInfoRequest.getItemInfoList()));
         xiaoJuStoreDao.save(xiaoJuStore);
         ResponseDTO responseDTO = new ResponseDTO();
-
         responseDTO.setAppKey(oilConfig.getAppId());
         responseDTO.setCode("0");
         responseDTO.setMsg("请求成功");
         responseDTO.setData("heO67plAls2+P9bo/7XJnHz77N8W+WyCP37/COPLr3k=");
         responseDTO.setSig("B1445B2A12037FADFCD6FAE6D83ECB9A");
-
         return responseDTO;
 
+    }
 
+    public ResultContent<QueryStoreDetailResponse> queryStoreDetail(String storeId) {
+        XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storeId);
+        QueryStoreDetailRequest queryStoreDetailRequest = new QueryStoreDetailRequest();
+
+        queryStoreDetailRequest.setOutUserId(authHelper.getCurrentUser().getUserId());
+        queryStoreDetailRequest.setStoreId(storeId);
+        queryStoreDetailRequest.setLat(byStoreId.getLat());
+        queryStoreDetailRequest.setLon(byStoreId.getLon());
+        queryStoreDetailRequest.setOpenChannel(1);
 
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
 
+        QueryStoreDetailResponse queryStoreDetailResponse = queryClient.api().queryStoreDetail(queryStoreDetailRequest);
 
+        return ResultContent.buildContent(queryStoreDetailResponse);
     }
 
 
 
 
 
+
+
+
+
 }

SpringBatchServiceServer/src/test/java/com/zswl/cloud/springBtach/server/boot/ServerApplicationTests.java

@@ -5,6 +5,7 @@ import com.github.microservice.auth.client.service.EnterpriseService;
 import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zswl.cloud.springBtach.server.core.api.xiaoju.XiaoJuApi;
+import com.zswl.cloud.springBtach.server.core.api.xiaoju.XiaoJuApi2;
 import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.domain.AllowanceInfo;
 import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.QueryNewOrderRequest;
 import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.SynOrderStatusRequest;
@@ -41,6 +42,9 @@ public class ServerApplicationTests {
     @Autowired
     XiaoJuApi xiaoJuApi;
 
+    @Autowired
+    XiaoJuApi2 xiaoJuApi2;
+
     @Test
     public void test1() {
         ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("66043b7f41096a5155e6c377", "65fe7c9174d67a7dbd842b74");
@@ -94,12 +98,12 @@ public class ServerApplicationTests {
     @Test
     public void test3() {
 
-        SynOrderStatusRequest synOrderStatusRequest = new SynOrderStatusRequest();
-        synOrderStatusRequest.setOutOrderId("123456789");
-        synOrderStatusRequest.setXjOrderId("3476780108933473940");
-        synOrderStatusRequest.setOrderStatus(9);
+//        SynOrderStatusRequest synOrderStatusRequest = new SynOrderStatusRequest();
+//        synOrderStatusRequest.setOutOrderId("123456789");
+//        synOrderStatusRequest.setXjOrderId("3476780108933473940");
+//        synOrderStatusRequest.setOrderStatus(9);
 
-        xiaoJuApi.syncOrderStatus(synOrderStatusRequest);
+        xiaoJuApi2.queryStoreDetail();
 
     }