.

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

@@ -22,18 +22,30 @@ public class XiaoJuController {
     @Autowired
     XiaoJuService xiaoJuService;
 
-    @ApiOperation("同步加油站信息")
+    @ApiOperation("推送-同步加油站信息")
     @RequestMapping(value = "receivingGasStation", method = RequestMethod.POST)
     public ResponseDTO receivingGasStation(@RequestBody OilRequest oilRequest) {
 
         return xiaoJuService.notificationPushStoreInfoRequest(oilRequest);
     }
+    @ApiOperation("推送-同步订单信息")
+    @RequestMapping(value = "notifyOrderInfo", method = RequestMethod.POST)
+    public ResponseDTO notifyOrderInfo(@RequestBody OilRequest oilRequest) {
+
+        return xiaoJuService.notifyOrderInfo(oilRequest);
+    }
     @ApiOperation("查看加油站详情")
     @RequestMapping(value = "queryStoreDetail", method = RequestMethod.POST)
     public ResultContent<QueryStoreDetailResponse> queryStoreDetail(String storeId) {
 
         return xiaoJuService.queryStoreDetail(storeId);
     }
+    @ApiOperation("查询门店价格")
+    @RequestMapping(value = "queryStorePrice", method = RequestMethod.POST)
+    public ResultContent<QueryStoreDetailResponse> queryStorePrice(String storeId) {
+
+        return xiaoJuService.queryStoreDetail(storeId);
+    }
 
 
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarDeliveryJob.java

@@ -58,7 +58,7 @@ public class StandarDeliveryJob {
                         resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail));
                         return RepeatStatus.FINISHED;
                     }
-
+                    orderService2.delivery(goodsResultModel.getId());
                     resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Success));
                     return RepeatStatus.FINISHED;
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/video/VideoDeliveryJob.java

@@ -3,7 +3,9 @@ package com.zswl.cloud.springBtach.server.core.job.video;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.client.content.ResultState;
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
+import com.zhongshu.payment.client.model.order.v2.VerificationModel;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zswl.cloud.shop.client.dto.yqd.OrderDto;
 import com.zswl.cloud.shop.client.service.GoodsService;
@@ -55,6 +57,19 @@ public class VideoDeliveryJob {
                         getResultContent().set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail));
                         return RepeatStatus.FINISHED;
                     }
+                    orderService2.delivery(goodsResultModel.getId());
+                    VerificationModel verificationModel = new VerificationModel();
+                    verificationModel.setId(goodsResultModel.getId());
+                    verificationModel.setShopId(null);
+                    verificationModel.setVerification(new JSONObject());
+                    ResultContent verification = orderService2.verification(verificationModel);
+                    if (!verification.getState().equals(ResultState.Success)){
+
+                        log.info("核销状态变更失败：{}",JSONUtil.toJsonStr(goodsResultModel));
+                        getResultContent().set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail));
+                        return RepeatStatus.FINISHED;
+
+                    }
                     getResultContent().set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Success));
                     return RepeatStatus.FINISHED;
 

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

@@ -11,17 +11,24 @@ import com.xiaoju.open.oil.core.QueryClient;
 import com.xiaoju.open.oil.core.QueryClientFactory;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
+import com.xiaoju.open.oil.interfaces.request.NotificationReceiveRefundRequest;
+import com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.request.QueryStoreDetailRequest;
+import com.xiaoju.open.oil.interfaces.response.QueryApiStorePriceResponse;
 import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
 import com.xiaoju.open.oil.security.secret.SecurityService;
 import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
+import io.swagger.util.Json;
 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;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class XiaoJuService {
 
@@ -52,12 +59,40 @@ public class XiaoJuService {
         }
 
         xiaoJuStoreDao.save(xiaoJuStore);
+
+
+        String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}",  oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
+        String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
+        ResponseDTO responseDTO = new ResponseDTO();
+        responseDTO.setAppKey(oilConfig.getAppId());
+        responseDTO.setCode("0");
+        responseDTO.setMsg("请求成功");
+        responseDTO.setData(data);
+        responseDTO.setSig(sig);
+        return responseDTO;
+
+    }
+    public ResponseDTO notifyOrderInfo(OilRequest oilRequest){
+
+
+        String s = SecurityService.genDecodeData(oilRequest.getData(), oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
+
+        log.info("通知 加油站详情：{}", s);
+        NotificationReceiveRefundRequest xiaoJuStore = JSONUtil.toBean(s, NotificationReceiveRefundRequest.class);
+
+
+
+
+
+
+        String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}",  oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
+        String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
         ResponseDTO responseDTO = new ResponseDTO();
         responseDTO.setAppKey(oilConfig.getAppId());
         responseDTO.setCode("0");
         responseDTO.setMsg("请求成功");
-        responseDTO.setData("heO67plAls2+P9bo/7XJnHz77N8W+WyCP37/COPLr3k=");
-        responseDTO.setSig("B1445B2A12037FADFCD6FAE6D83ECB9A");
+        responseDTO.setData(data);
+        responseDTO.setSig(sig);
         return responseDTO;
 
     }
@@ -78,6 +113,20 @@ public class XiaoJuService {
 
         return ResultContent.buildContent(queryStoreDetailResponse);
     }
+    public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(String storeId) {
+        QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
+        queryApiStorePriceRequest.setOpenChannel(1);
+        queryApiStorePriceRequest.setOutUserId("dajihao2");
+        List<String> list = new ArrayList<>();
+        list.add("5154031457384536897");
+        queryApiStorePriceRequest.setStoreIds(list);
+
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        List<QueryApiStorePriceResponse> list1 = queryClient.api().queryStorePrice(queryApiStorePriceRequest);
+        return ResultContent.buildContent(list1);
+    }