核销时分账

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

@@ -5,9 +5,13 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.xiaoju.open.oil.commons.OilRequest;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
-import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
+import com.xiaoju.open.oil.interfaces.response.QueryApiStorePriceResponse;
+import com.xiaoju.open.oil.interfaces.response.QueryCalBatchPriceResponse;
+import com.xiaoju.open.oil.interfaces.response.QueryCalPriceResponse;
 import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
 import com.zswl.cloud.springBatch.client.model.request.NearbyModel;
+import com.zswl.cloud.springBatch.client.model.request.QueryCalPriceModel;
+import com.zswl.cloud.springBatch.client.model.request.QueryCalPricesModel;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 import com.zswl.cloud.springBtach.server.core.service.XiaoJuService;
 import io.swagger.annotations.ApiOperation;
@@ -28,37 +32,50 @@ public class XiaoJuController {
     @Autowired
     XiaoJuService xiaoJuService;
 
+    @ApiOperation("推送-同步订单信息")
+    @RequestMapping(value = "notifyOrderInfo", method = RequestMethod.POST)
+    @ResourceAuth(value = "user", type = AuthType.User)
+    public ResponseDTO notifyOrderInfo(@RequestBody OilRequest oilRequest) {
+
+        return xiaoJuService.notifyOrderInfo(oilRequest);
+    }
     @ApiOperation("推送-同步加油站信息")
     @RequestMapping(value = "receivingGasStation", method = RequestMethod.POST)
+    @ResourceAuth(value = "user", type = AuthType.User)
     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("查看附近的加油站信息")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "nearbyStore", method = RequestMethod.POST)
+    public ResultContent<List<XiaoJuStore>> nearbyStore(@RequestBody NearbyModel nearbyModel) {
+        return xiaoJuService.nearbyStore(nearbyModel);
+    }
+    @ApiOperation("查询门店价格")
+    @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);
     }
     @ApiOperation("查看加油站详情")
     @RequestMapping(value = "queryStoreDetail", method = RequestMethod.POST)
+    @ResourceAuth(value = "user", type = AuthType.User)
     public ResultContent<QueryStoreDetailResponse> queryStoreDetail(String storeId) {
 
         return xiaoJuService.queryStoreDetail(storeId);
     }
-    @ApiOperation("查询门店价格")
-    @RequestMapping(value = "queryStorePrice", method = RequestMethod.POST)
+    @ApiOperation("价格计算")
+    @RequestMapping(value = "queryCalPrice", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
-    public ResultContent<QueryStoreDetailResponse> queryStorePrice(String storeId) {
-
-        return xiaoJuService.queryStoreDetail(storeId);
+    public ResultContent<QueryCalPriceResponse> queryCalPrice(QueryCalPriceModel queryCalPriceModel) {
+        return xiaoJuService.queryCalPrice(queryCalPriceModel);
     }
-    @ApiOperation("查看附近的加油站信息")
+    @ApiOperation("批量价格计算")
+    @RequestMapping(value = "queryCalPrices", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
-    @RequestMapping(value = "nearbyStore", method = RequestMethod.POST)
-    public ResultContent<List<XiaoJuStore>> nearbyStore(@RequestBody NearbyModel nearbyModel) {
-
-        return xiaoJuService.nearbyStore(nearbyModel);
+    public ResultContent<QueryCalBatchPriceResponse> queryCalPrices(QueryCalPricesModel queryCalPriceModel) {
+        return xiaoJuService.queryCalPrices(queryCalPriceModel);
     }
 
 

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

@@ -87,12 +87,6 @@ public class StandarVerificationJob {
                             break;
                     }
 
-
-                    ResultContent<SubOrdersConfirmResponseModel> resultContent = paymentService2.subOrdersConfirm(verificationModel.getId(), verificationModel.getShopId());
-                    if (!resultContent.getState().equals(ResultState.Success)) {
-                        getResultContent().set(resultContent);
-                        return RepeatStatus.FINISHED;
-                    }
                     getResultContent().set(orderService2.verification(verificationModel));
                     return RepeatStatus.FINISHED;
                 })

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

@@ -1,6 +1,5 @@
 package com.zswl.cloud.springBtach.server.core.job.video;
 
-import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
@@ -8,6 +7,7 @@ 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.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zswl.cloud.shop.client.dto.yqd.OrderDto;
 import com.zswl.cloud.shop.client.service.GoodsService;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
@@ -38,6 +38,8 @@ public class VideoDeliveryJob {
     @Autowired
     OrderService2 orderService2;
 
+    @Autowired
+    PaymentService2 paymentService2;
 
     @Autowired
     YqdServiceImpl yqdServiceImpl;
@@ -64,7 +66,6 @@ public class VideoDeliveryJob {
                     entries1.set("response", resultContent.getContent());
                     orderService2.updateExtend(goodsResultModel.getId(), JSONUtil.toJsonStr(entries1));
 
-                    orderService2.delivery(goodsResultModel.getId());
                     VerificationModel verificationModel = new VerificationModel();
                     verificationModel.setId(goodsResultModel.getId());
                     verificationModel.setShopId(null);

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

@@ -1,7 +1,6 @@
 package com.zswl.cloud.springBtach.server.core.service;
 
 
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.helper.AuthHelper;
@@ -10,19 +9,16 @@ import com.xiaoju.open.oil.commons.config.OilConfig;
 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.interfaces.domain.AllowanceInfo;
+import com.xiaoju.open.oil.interfaces.request.*;
+import com.xiaoju.open.oil.interfaces.response.*;
 import com.xiaoju.open.oil.security.secret.SecurityService;
 import com.zswl.cloud.springBatch.client.model.request.NearbyModel;
+import com.zswl.cloud.springBatch.client.model.request.QueryCalPriceModel;
+import com.zswl.cloud.springBatch.client.model.request.QueryCalPricesModel;
 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 lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,11 +26,11 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
+@Log4j2
 @Service
 public class XiaoJuService {
 
 
-    private static final Logger log = LoggerFactory.getLogger(XiaoJuService.class);
     @Autowired
     AuthHelper authHelper;
 
@@ -56,17 +52,15 @@ public class XiaoJuService {
 
         XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(xiaoJuStore.getStoreId());
         if (byStoreId != null) {
-            BeanUtils.copyProperties(byStoreId, xiaoJuStore, "id","updateTime");
+            BeanUtils.copyProperties(byStoreId, xiaoJuStore, "id", "updateTime");
             byStoreId.setLocation(new double[]{xiaoJuStore.getLon(), xiaoJuStore.getLat()});
             xiaoJuStoreDao.save(byStoreId);
-        }else {
+        } else {
             xiaoJuStore.setLocation(new double[]{xiaoJuStore.getLon(), xiaoJuStore.getLat()});
             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();
@@ -117,13 +111,12 @@ public class XiaoJuService {
         return ResultContent.buildContent(queryStoreDetailResponse);
     }
 
-    public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(String storeId) {
+    public ResultContent<List<QueryApiStorePriceResponse>> queryStorePrice(List<String> storeIdList) {
+        String userId = authHelper.getCurrentUser().getUserId();
         QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
         queryApiStorePriceRequest.setOpenChannel(1);
-        queryApiStorePriceRequest.setOutUserId("dajihao2");
-        List<String> list = new ArrayList<>();
-        list.add("5154031457384536897");
-        queryApiStorePriceRequest.setStoreIds(list);
+        queryApiStorePriceRequest.setOutUserId(userId);
+        queryApiStorePriceRequest.setStoreIds(storeIdList);
 
 
         QueryClient queryClient = QueryClientFactory.create(oilConfig);
@@ -140,4 +133,80 @@ public class XiaoJuService {
     }
 
 
+    // 价格计算
+    public ResultContent<QueryCalPriceResponse> queryCalPrice(QueryCalPriceModel queryCalPriceModel) {
+
+        String userId = authHelper.getCurrentUser().getUserId();
+        QueryCalPriceRequest queryCalPriceRequest = new QueryCalPriceRequest();
+        queryCalPriceRequest.setStoreId(queryCalPriceModel.getStoreId());
+        queryCalPriceRequest.setOpenChannel(1);
+        queryCalPriceRequest.setOutUserId(userId);
+        queryCalPriceRequest.setItemName(queryCalPriceModel.getItemName());
+        queryCalPriceRequest.setAmount(queryCalPriceModel.getAmount());
+
+        queryCalPriceRequest.setPromotionInfo(queryCalPriceModel.getAllowanceinfo());
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        QueryCalPriceResponse queryCalPriceResponse = queryClient.api().queryCalPrice(queryCalPriceRequest);
+
+
+        return ResultContent.buildContent(queryCalPriceResponse);
+    }
+
+
+    // 批量价格计算
+    public ResultContent<QueryCalBatchPriceResponse> queryCalPrices(QueryCalPricesModel queryCalPricesModel) {
+
+        String userId = authHelper.getCurrentUser().getUserId();
+        QueryCalBatchPriceRequest queryCalPriceRequest = new QueryCalBatchPriceRequest();
+        queryCalPriceRequest.setStoreId(queryCalPricesModel.getStoreId());
+        queryCalPriceRequest.setOpenChannel(1);
+        queryCalPriceRequest.setOutUserId(userId);
+
+        queryCalPriceRequest.setItemList(queryCalPricesModel.getItemList());
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        QueryCalBatchPriceResponse queryCalBatchPriceResponse = queryClient.api().queryCalPrices(queryCalPriceRequest);
+
+        return ResultContent.buildContent(queryCalBatchPriceResponse);
+
+    }
+
+
+    // 创建订单
+    public void queryNewOrder() {
+        QueryNewOrderRequest queryNewOrderRequest = new QueryNewOrderRequest();
+        queryNewOrderRequest.setOutUserId("a09kWkRLM2ZWcWs9");
+        queryNewOrderRequest.setMobile("13111222233");
+        queryNewOrderRequest.setOutOrderId("123456789");
+        queryNewOrderRequest.setLat(114.30F);
+        queryNewOrderRequest.setLon(14.23F);
+        queryNewOrderRequest.setStoreId("5211967762877389105");
+        queryNewOrderRequest.setItemId(4879454965524071453L);
+        queryNewOrderRequest.setGunNo("10");
+        queryNewOrderRequest.setOriginalAmount(20000);
+        queryNewOrderRequest.setPaymentAmount(18000);
+        queryNewOrderRequest.setServiceFee(20);
+        queryNewOrderRequest.setLitre(382);
+        queryNewOrderRequest.setVipPrice(460);
+        queryNewOrderRequest.setStorePrice(523);
+
+        // 优惠券
+        List<AllowanceInfo> allowanceInfos = new ArrayList<>();
+        AllowanceInfo allowanceInfo = new AllowanceInfo();
+        allowanceInfo.setAllowanceId("E1-4ji-1kiJSL");
+        allowanceInfo.setAllowanceType(2);
+        allowanceInfos.add(allowanceInfo);
+
+        queryNewOrderRequest.setPromotionInfo(allowanceInfos);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        QueryNewOrderResponse queryNewOrderResponse = queryClient.api().queryNewOrder(queryNewOrderRequest);
+
+
+    }
+
 }

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

@@ -1,9 +1,17 @@
 package com.zswl.cloud.springBtach.server.boot;
 
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.service.EnterpriseService;
+import com.xiaoju.open.oil.commons.OilRequest;
+import com.zhongshu.payment.client.model.order.v2.VerificationModel;
 import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
+import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
+import com.zswl.cloud.shop.client.dto.life.OperateStockDto;
+import com.zswl.cloud.shop.client.service.GoodsService;
+import com.zswl.cloud.springBatch.client.model.request.NearbyModel;
 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;
@@ -11,14 +19,19 @@ import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.QueryNewOrd
 import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.SynOrderStatusRequest;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.controller.TestSpringBatch;
+import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 import com.zswl.cloud.springBtach.server.core.service.OrderServiceImp;
+import com.zswl.cloud.springBtach.server.core.service.PaymentService;
+import com.zswl.cloud.springBtach.server.core.service.XiaoJuService;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 @SpringBootTest
 @Log4j2
@@ -45,6 +58,9 @@ public class ServerApplicationTests {
     @Autowired
     XiaoJuApi2 xiaoJuApi2;
 
+    @Autowired
+    PaymentService paymentService;
+
     @Test
     public void test1() {
         ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("66043b7f41096a5155e6c377", "65fe7c9174d67a7dbd842b74");
@@ -103,44 +119,54 @@ public class ServerApplicationTests {
 //        synOrderStatusRequest.setXjOrderId("3476780108933473940");
 //        synOrderStatusRequest.setOrderStatus(9);
 
-        xiaoJuApi2.queryStoreDetail();
+//        xiaoJuApi2.queryStoreDetail();
+
+        ResultContent query = paymentService.query("1778713503232118784");
+        System.out.println(query);
 
     }
 
-//    @Autowired
-//    OilConfig oilConfig;
-//    @Test
-//    public  void queryNewOrder() {
-//        QueryNewOrderRequest queryNewOrderRequest = new QueryNewOrderRequest();
-//        queryNewOrderRequest.setOutUserId("a09kWkRLM2ZWcWs9");
-//        queryNewOrderRequest.setMobile("13111222233");
-//        queryNewOrderRequest.setOutOrderId("123456789");
-//        queryNewOrderRequest.setLat(114.30F);
-//        queryNewOrderRequest.setLon(14.23F);
-//        queryNewOrderRequest.setStoreId("5211967762877389105");
-//        queryNewOrderRequest.setItemId(4879454965524071453L);
-//        queryNewOrderRequest.setGunNo("10");
-//        queryNewOrderRequest.setOriginalAmount(20000);
-//        queryNewOrderRequest.setPaymentAmount(18000);
-//        queryNewOrderRequest.setServiceFee(20);
-//        queryNewOrderRequest.setLitre(382);
-//        queryNewOrderRequest.setVipPrice(460);
-//        queryNewOrderRequest.setStorePrice(523);
-//
-//        // 优惠券
-//        List<AllowanceInfo> allowanceInfos = new ArrayList<>();
-//        AllowanceInfo allowanceInfo = new AllowanceInfo();
-//        allowanceInfo.setAllowanceId("E1-4ji-1kiJSL");
-//        allowanceInfo.setAllowanceType(2);
-//        allowanceInfos.add(allowanceInfo);
-//
-//        queryNewOrderRequest.setPromotionInfo(allowanceInfos);
-//
-//        QueryClient queryClient = QueryClientFactory.create(oilConfig);
-//
-//        QueryNewOrderResponse queryNewOrderResponse = queryClient.api().queryNewOrder(queryNewOrderRequest);
-//
-//        System.out.println(new Gson().toJson(queryNewOrderResponse));
-//
-//    }
+    @Autowired
+    XiaoJuService xiaoJuService;
+
+    @Test
+    public void queryNewOrder() {
+        String aa = "{\n" +
+                "    \"appKey\": \"zhongshu\",\n" +
+                "    \"timeStamp\": \"20240415121001\",\n" +
+                "    \"sig\": \"1E1EE85CF4F84A21794573E15C03C578\",\n" +
+                "    \"data\": \"qtbnA681VTMwk632onLQSB/4kgGULv3Wr86l2E4linH4+2c0LyxGaqzMfi1l5ZQODaWjYcxQzavICNBD62iSIf+C/NaToYmqIHjmLTUrSXHQy7f5Q+NQpZxDpmEjMHOKDP9TIJ/qMoo5w89H8RuFHPyu0FUraDcWgZWElA3nIOUA4nhWmEudv23nzyh8fva8jR3ZLw+AkL9VjPt942RzNC9hmHKXrPP0ykbPuWAVXRHfHupmRQhZfqcFA7Ws4yzZxDZYnMsUF/4QKl6mr0lb76aYceUka8CIqgjU6U4VK3yXpsA7zxlQBdjEqoKMf7uSlvlPFERn2FA9p6l/nkzriYo+30+5qZHSc/CihF8bLpGy41jhtUgWcPnKR6Al0BE2jj2aXOon9HRQ9TtfbZkY7OM2WFKUOaKYksVrVVOwNEtBhjjc9GI35t+PYcd9JqpOYYGFH6vt+vd7YZjt4Aa2r6PPQTV2V6uS2DCRBY4l3O/T6BkhHfDb9QfnzX7k6RQFigjGpZ/n6qsA3oyM934JFRjlhqA5jznUPW/q4jyAT8zpxe0UsB8QOJbdihwIRhzXfQgpuXVcosGVErO/8tnT10V8Yt7yH4JtToK3Rt/5kr0VD7Q3XrM8qkJ25iIVCKxW5QRYQI6786aWxi+az0bXGVwN3l3AfiAlXEpsIjoop4WpiRAE/3dYpAoX/MI6ridrVUA8kdqkVQlz7ZaiZAt2G/XUFgC124lQ1y3BvCRJuNo9R8dg83jJmgSZBfAXl5+7Sl8lauDoAu3tmW+vYVLJKuNM/ZhUkLrQCxYwyUTsE01UixUjVmcEhdwQu9TA1kWSG2ZGgJ82pK0BqcV+L/z/2l3WGExDxq4tpHwT+Zeis+6cnFMtIoIMntD+2p2ag3czMQ6JNhglivyPVr9FC7/r1rNKw2m75/+VKdW0BPDXPuH+n3WZQkBHpSDpwO9m5rM0tbBDcoyAQAQSCJPFhg/jb1Qd5CXJg3C+BOwzpILFYDSGWyrt9VXuSxr+4OdbcymRzYVED3CZiIJ1UiuG4YcjRTm1CoG9d9/mpOaO04x0DbyZkgjpH8Tvpztf3u03cpwnptoE0NMUPs9C3upfEPmNMTEiA0rEehn9O22LDm+xM87wb57whDlgC4P+/T78vdOK1tcgVoAKox8UfCre3mG2hiVYUNKnw3DRsCkT6L8jrSkZaYVEeFdf3WRf6+m+nA6KWgazxCoc+gG86YT44tfLqYVKq3uKMWes5hoj4raaiP86Ch/gAH2XydP9K30KzO+M/x8HErimwpIYq9XfcwFSBxyN6zTiydLIxyHEsJQsPy99YvspaZOktbAFbIFNxsiYcYxc/6RYaFExulfXvCpjDmzp675ngeYBlPs52/jRoD6uYygiyxfcl588XjOUo8grVuPXNEp1HEJgA75z48LZfCXsutAazQb5RnC8YHvu3CdZNnRQarxwqNV8LEaVzvxL/7Vs2FjhEcDIX81cd/BPri49CDTdxH3m/zZr1zoNlaspmRZAmYBTdC8SQ8N6LT2moNtV5TRz3HmiZgSvv2DkvhcFNBl4ayiKkGcBisM5myYGidQLkTQk/P3IqQwVCAjCnC4mwJQ/n2GPmm2F3EZzKaTgJVd82qxPiBSN9XN/+678Er323U/tIjaP2djl1cPrxIdAONjG4Jw4XEWMmxhgECnc+55ctnZceMUXdcwOJlhRfPCP717qh35eQnxsmC6I\",\n" +
+                "    \"requestId\": \"0ac3b42b661ca89751f20b4b3017fe86\"\n" +
+                "}";
+
+        OilRequest bean = JSONUtil.toBean(aa, OilRequest.class);
+        xiaoJuService.notificationPushStoreInfoRequest(bean);
+    }
+
+
+    @Test
+    public void queryNewOrder1() {
+        NearbyModel nearbyModel = new NearbyModel();
+        nearbyModel.setLatitude(22.80780029296875);
+        nearbyModel.setLongitude(100.99479675292969);
+        nearbyModel.setMaxDistanceInKilometers(20);
+        ResultContent<List<XiaoJuStore>> listResultContent = xiaoJuService.nearbyStore(nearbyModel);
+
+
+    }
+
+    @Autowired
+    GoodsService goodsService;
+
+    @Autowired
+    OrderService2 orderService2;
+
+    @Test
+    public void queryNewOrderdd() {
+
+
+        ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("661c92831bb78962d9b41d02", "6618d9be32e63427d1a17009");
+        System.out.println(subOrdersConfirmResponseModelResultContent);
+
+    }
 }