gongfuzhu hace 1 año
padre
commit
d96774bc70

+ 180 - 102
SpringBatchServiceServer/src/test/java/com/zswl/cloud/springBtach/server/boot/ServerApplicationTests.java

@@ -1,42 +1,46 @@
 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.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.interfaces.domain.AllowancePromotionInfo;
+import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
+import com.xiaoju.open.oil.interfaces.request.QueryGetPromotionRequest;
+import com.xiaoju.open.oil.interfaces.request.QueryOrderPromotionListRequest;
+import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniProgramQueryNewOrderRequest;
+import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniQueryCalPriceRequest;
+import com.xiaoju.open.oil.interfaces.response.miniprogram.MiniQueryCalPriceResponse;
+import com.xiaoju.open.oil.interfaces.response.miniprogram.MiniQueryNewOrderResponse;
 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.dto.life.TripartiteShopDto;
 import com.zswl.cloud.shop.client.service.GoodsService;
-import com.zswl.cloud.springBatch.client.model.request.NearbyModel;
-import com.zswl.cloud.springBatch.client.model.request.XiaoJuStoreModel;
+import com.zswl.cloud.shop.client.service.ShopService;
+import com.zswl.cloud.springBatch.client.model.dfy.DomesticHotel.request.QueryNewRequest;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.PrivilegeTicketListRequest;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.ScenicDetailRequest;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.ScenicListRequest;
+import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.PrivilegeTicketListResponse;
+import com.zswl.cloud.springBtach.server.core.api.dfy.DomesticHotelApi;
+import com.zswl.cloud.springBtach.server.core.api.dfy.TicketApi;
 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;
 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.dao.XiaoJuStoreDao;
 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 com.zswl.cloud.springBtach.server.core.service.impl.OrderServiceImpl;
 import lombok.extern.log4j.Log4j2;
-import org.bson.Document;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.geo.*;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ThreadPoolExecutor;
 
 @SpringBootTest
 @Log4j2
@@ -48,7 +52,7 @@ public class ServerApplicationTests {
     TestSpringBatch testSpringBatch;
 
     @Autowired
-    OrderServiceImp orderService;
+    OrderServiceImpl orderService;
 
 
     @Autowired
@@ -65,102 +69,93 @@ public class ServerApplicationTests {
 
     @Autowired
     PaymentService paymentService;
+    @Autowired
+    private XiaoJuStoreDao xiaoJuStoreDao;
 
-    @Test
-    public void test1() {
-        ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("66043b7f41096a5155e6c377", "65fe7c9174d67a7dbd842b74");
-        System.out.println(subOrdersConfirmResponseModelResultContent);
-
-
-////        JSONObject movies = piaoPiaoApi.movies("9", "0", "20");
-////        System.out.println(movies);
-//        System.out.println(piaoPiaoApi.movie_detail("194856"));
-//
-//        JSONObject citys = piaoPiaoApi.get_citys();
-////
-//        JSONUtil.toJsonStr(piaoPiaoApi.movies("103", "1", "40"));
-////        System.out.println(citys);
-//        System.out.println("dddddddddddddddddddddd");
-    }
+
+    @Autowired
+    TicketApi diFengYunApi;
 
     @Test
-    public void test2() {
-        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.setOrderAmount(20000);
-        queryNewOrderRequest.setRealAmount(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);
-
-        xiaoJuApi.queryNewOrder(queryNewOrderRequest);
-
-//        System.out.println(JSONUtil.toJsonStr(dddddd));
+    public void dfy() {
 
-    }
 
-    @Test
-    public void test3() {
+        ScenicListRequest scenic = new ScenicListRequest();
+        scenic.setKey("南京");
+        scenic.setPage("1");
+        scenic.setPageSize("10");
+
+
+
+//        ScenicListResponse scenicListResponse = diFengYunApi.scenicList(scenicRequest);
+//        System.out.println(JSONUtil.toJsonStr(scenicListResponse));
+
+
+        ScenicDetailRequest  scenicDetailRequest= new ScenicDetailRequest();
+        scenicDetailRequest.setScenicId("poi1745");
 
-//        SynOrderStatusRequest synOrderStatusRequest = new SynOrderStatusRequest();
-//        synOrderStatusRequest.setOutOrderId("123456789");
-//        synOrderStatusRequest.setXjOrderId("3476780108933473940");
-//        synOrderStatusRequest.setOrderStatus(9);
+//        ScenicDetailResponse scenicDetailResponse = diFengYunApi.scenicDetail(scenicDetailRequest);
+//        System.out.println(JSONUtil.toJsonStr(scenicDetailResponse));
 
-//        xiaoJuApi2.queryStoreDetail();
+        PrivilegeTicketListRequest privilegeTicketListRequest = new PrivilegeTicketListRequest();
+        privilegeTicketListRequest.setPage(1);
+        privilegeTicketListRequest.setPageSize(20);
 
-        ResultContent query = paymentService.query("1778713503232118784");
-        System.out.println(query);
+        PrivilegeTicketListResponse scenicListResponse = diFengYunApi.privilegeTicketList(privilegeTicketListRequest);
+        System.out.println(JSONUtil.toJsonStr(scenicListResponse));
 
     }
 
-    @Autowired
-    XiaoJuService xiaoJuService;
 
+    @Autowired
+    DomesticHotelApi domesticHotelApi;
     @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);
+    public void hotel(){
+        QueryNewRequest queryNewRequest = new QueryNewRequest();
+        queryNewRequest.setKeywords("日本");
+        domesticHotelApi.queryNew(queryNewRequest);
+
+
     }
 
 
+    @Autowired
+    ShopService shopService;
+
     @Test
-    public void queryNewOrder1() {
-        NearbyModel nearbyModel = new NearbyModel();
-        nearbyModel.setLatitude(22.80780029296875);
-        nearbyModel.setLongitude(100.99479675292969);
-        nearbyModel.setMaxDistanceInKilometers(20);
-        ResultContent<List<XiaoJuStoreModel>> listResultContent = xiaoJuService.nearbyStore(nearbyModel);
-        System.out.println(listResultContent);
+    public void test3() {
+
+        for (XiaoJuStore xiaoJuStore : xiaoJuStoreDao.findAll()) {
+
+            TripartiteShopDto tripartiteShopDto = new TripartiteShopDto();
+            tripartiteShopDto.setKey("加油");
+            tripartiteShopDto.setTripartiteId(xiaoJuStore.getStoreId());
+            tripartiteShopDto.setShopName(xiaoJuStore.getStoreName());
+            tripartiteShopDto.setShopMenuId("4");
+            tripartiteShopDto.setProvince(xiaoJuStore.getProvinceName());
+            tripartiteShopDto.setCity(xiaoJuStore.getCityName());
+            tripartiteShopDto.setAddress(xiaoJuStore.getAddress());
+            tripartiteShopDto.setMapLon(String.valueOf(xiaoJuStore.getLon()));
+            tripartiteShopDto.setMapLat(String.valueOf(xiaoJuStore.getLat()));
+            tripartiteShopDto.setLogoPath(xiaoJuStore.getLogo());
+            if (xiaoJuStore.getPicList().size() > 0) {
+                tripartiteShopDto.setDetailImg(xiaoJuStore.getPicList().get(0));
+            }
+            tripartiteShopDto.setTripartiteJson(JSONUtil.toJsonStr(xiaoJuStore));
+
+            com.zswl.cloud.shop.client.ret.ResultContent resultContent = shopService.tripartiteShop(tripartiteShopDto);
+            log.info("创建店铺响应{}", JSONUtil.toJsonStr(resultContent));
+        }
+
+
 
 
     }
 
+    @Autowired
+    XiaoJuService xiaoJuService;
+
+
     @Autowired
     GoodsService goodsService;
 
@@ -169,18 +164,101 @@ public class ServerApplicationTests {
     @Autowired
     MongoTemplate mongoTemplate;
 
+
+    @Autowired
+    OilConfig oilConfig;
+
     @Test
-    public void queryNewOrderdd() {
+    public void queryNewOrderq1() {
+        MiniProgramQueryNewOrderRequest newOrderRequest = new MiniProgramQueryNewOrderRequest();
+        newOrderRequest.setStoreId("5154031457384536897");
+        newOrderRequest.setGunNo("2");
+        newOrderRequest.setLat(30.280486F);
+        newOrderRequest.setLon(120.094503F);
+        newOrderRequest.setLitre(13450);
+        newOrderRequest.setOpenChannel(1);
+        newOrderRequest.setOrderAmount(10000);
+        newOrderRequest.setRealAmount(7708);
+        newOrderRequest.setOutOrderId("13232344343");
+        newOrderRequest.setOutUserId("65fe583d74d67a7dbd842b45");
+        newOrderRequest.setServiceFee(312);
+        newOrderRequest.setItemId(4879454965524071453L);
+        newOrderRequest.setMobile("13368172379");
+
+        com.xiaoju.open.oil.interfaces.domain.AllowanceInfo allowanceInfo = new com.xiaoju.open.oil.interfaces.domain.AllowanceInfo();
+
+        newOrderRequest.setPromotionInfo(List.of());
+
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        MiniQueryNewOrderResponse response = queryClient.apiMini().queryNewOrder(newOrderRequest);
+        System.out.println(response);
 
+    }
 
-        Point point = new Point(45.530548095703125, 126.95394134521484);
-        NearQuery query = NearQuery.near(point).maxDistance(new Distance(200, Metrics.KILOMETERS));
-        GeoResults<XiaoJuStore> results = mongoTemplate.geoNear(query, XiaoJuStore.class);
-        for (GeoResult<XiaoJuStore> xiaoJuStoreGeoResult : results.getContent()) {
+    // 下单前查询最优可用券
+    @Test
+    public void queryOrderPromotionList() {
+        QueryOrderPromotionListRequest request = new QueryOrderPromotionListRequest();
+        request.setOutUserId("80200281708");
+        request.setStoreId("5429504232738269218");
+        request.setAllowanceType(2);
+        request.setOrderAmount(24500);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<AllowancePromotionInfo> response = queryClient.promotion().queryOrderPromotionList(request);
+        System.out.println(response);
+    }
 
-            xiaoJuStoreGeoResult.getContent();
-            xiaoJuStoreGeoResult.getDistance();
 
-        }
+    // 券发放
+    @Test
+    public void getPromotion() {
+        QueryGetPromotionRequest request = new QueryGetPromotionRequest();
+        request.setOutUserId("18874");
+        request.setActivityId("872933491179388928");
+        request.setTradeNo("2202071307003069990");
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<GenPromotionInfo> response = queryClient.promotion().getPromotion(request);
+        System.out.println(response);
+    }
+
+    @Test
+    public void queryCalPrice() {
+        MiniQueryCalPriceRequest calPriceRequest = new MiniQueryCalPriceRequest();
+        calPriceRequest.setStoreId("5429780558166639664");
+        calPriceRequest.setAmount(10000);
+        calPriceRequest.setItemName("92#");
+        calPriceRequest.setOpenChannel(1);
+        calPriceRequest.setOutUserId("65fe583d74d67a7dbd842b45");
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        MiniQueryCalPriceResponse response = queryClient.apiMini().queryCalPrice(calPriceRequest);
+        System.out.println(JSONUtil.toJsonStr(response));
+
+    }
+
+    @Test
+    public void queryNewOrder() {
+        MiniProgramQueryNewOrderRequest newOrderRequest = new MiniProgramQueryNewOrderRequest();
+        newOrderRequest.setStoreId("5154031457384536897");
+        newOrderRequest.setOutUserId("1640563200");
+        newOrderRequest.setMobile("13368172379");
+        newOrderRequest.setGunNo("2");
+        newOrderRequest.setLat(30.280486F);
+        newOrderRequest.setLon(120.094503F);
+        newOrderRequest.setLitre(13450);
+        newOrderRequest.setOpenChannel(1);
+        newOrderRequest.setOrderAmount(10000);
+        newOrderRequest.setRealAmount(7708);
+        newOrderRequest.setOutOrderId("13232344343");
+        newOrderRequest.setServiceFee(312);
+        newOrderRequest.setItemId(4879454965524071453L);
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        MiniQueryNewOrderResponse response = queryClient.apiMini().queryNewOrder(newOrderRequest);
+
     }
+
+
 }