|
@@ -14,6 +14,7 @@ import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniProgramQueryNewOrd
|
|
|
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.model.order.v2.GoodsResultModel;
|
|
|
import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
|
|
|
import com.zhongshu.payment.client.model.order.v2.UserSeachOrder2Model;
|
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
@@ -22,11 +23,14 @@ import com.zhongshu.payment.client.type.Channel;
|
|
|
import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
|
|
|
import com.zswl.cloud.shop.client.service.GoodsService;
|
|
|
import com.zswl.cloud.shop.client.service.ShopService;
|
|
|
-import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.QueryNewRequest;
|
|
|
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.SubmitOrderRequest;
|
|
|
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.AddOrderResponse;
|
|
|
+import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.SubmitOrderResponse;
|
|
|
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.ScenicListResponse;
|
|
|
+import com.zswl.cloud.springBatch.client.service.DfyHotelService;
|
|
|
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.ypp.YppApi;
|
|
@@ -34,7 +38,7 @@ 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.PaymentService;
|
|
|
-import com.zswl.cloud.springBtach.server.core.service.XiaoJuService;
|
|
|
+import com.zswl.cloud.springBtach.server.core.service.impl.XiaoJuServiceImpl;
|
|
|
import com.zswl.cloud.springBtach.server.core.service.impl.DfyTicketServiceImpl;
|
|
|
import com.zswl.cloud.springBtach.server.core.service.impl.OrderServiceImpl;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
@@ -44,6 +48,7 @@ import org.springframework.boot.test.context.SpringBootTest;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.mongodb.core.MongoTemplate;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
|
|
|
@SpringBootTest
|
|
@@ -76,6 +81,9 @@ public class ServerApplicationTests {
|
|
|
@Autowired
|
|
|
TicketApi diFengYunApi;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ DfyHotelService dfyHotelService;
|
|
|
+
|
|
|
@Test
|
|
|
public void dfy() {
|
|
|
|
|
@@ -111,11 +119,29 @@ public class ServerApplicationTests {
|
|
|
DomesticHotelApi domesticHotelApi;
|
|
|
@Test
|
|
|
public void hotel(){
|
|
|
- QueryNewRequest queryNewRequest = new QueryNewRequest();
|
|
|
- queryNewRequest.setKeywords("日本");
|
|
|
- domesticHotelApi.queryNew(queryNewRequest);
|
|
|
+// CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
|
|
|
+// cancelOrderRequest.setOrderId("1248207159");
|
|
|
+//
|
|
|
+// CancelOrderResponse cancelOrderResponse = domesticHotelApi.cancelOrder(cancelOrderRequest);
|
|
|
+// System.out.println(JSONUtil.toJsonStr(cancelOrderResponse));
|
|
|
+
|
|
|
+
|
|
|
+ ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.orderInfo("1798294662177759232");
|
|
|
+ ResultContent<List<GoodsResultModel>> listResultContent = orderService2.goodsDetail("1798294662177759232");
|
|
|
+ GoodsResultModel goodsResultModel = listResultContent.getContent().get(0);
|
|
|
+ BigDecimal payAmount = goodsResultModel.getPayAmount();
|
|
|
+
|
|
|
+ String extend = goodsResultModel.getExtend();
|
|
|
+ AddOrderResponse.Datas bean = JSONUtil.toBean(extend, AddOrderResponse.Datas.class);
|
|
|
+
|
|
|
|
|
|
+ SubmitOrderRequest submitOrderRequest = new SubmitOrderRequest();
|
|
|
+ submitOrderRequest.setOrderId(bean.getOrderId());
|
|
|
+ submitOrderRequest.setPayType(1);
|
|
|
+ submitOrderRequest.setPay(String.valueOf(payAmount));
|
|
|
|
|
|
+ SubmitOrderResponse submitOrderResponse = domesticHotelApi.submitOrder(submitOrderRequest);
|
|
|
+ System.out.println(submitOrderResponse);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -153,7 +179,7 @@ public class ServerApplicationTests {
|
|
|
}
|
|
|
|
|
|
@Autowired
|
|
|
- XiaoJuService xiaoJuService;
|
|
|
+ XiaoJuServiceImpl xiaoJuService;
|
|
|
|
|
|
|
|
|
@Autowired
|