渠道订单ID调整

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

@@ -9,6 +9,7 @@ import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
+import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.TransferOwner;
@@ -179,6 +180,13 @@ public class YppService {
         apiLog.setSystem("ypp");
         apiLog.setRequest(JSONUtil.toJsonStr(syncOrderRequest));
         apiLogDao.save(apiLog);
+
+        ResultContent<GoodsResultModel> channelGoods = orderService2.findChannelGoods(JobFlowMap.YPP, syncOrderRequest.getData().getId());
+        GoodsResultModel content = channelGoods.getContent();
+        if (syncOrderRequest.getData().getState().equals(0)){
+
+
+        }
         return "成功";
 
     }

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

@@ -153,7 +153,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
         createOrder2Model.setChannel(addOrderRequest.getChannel());
         JSONObject goodsInfo = JSONUtil.parseObj(addOrderRequest);
         goodsInfo.set("hotelInfo", orderDetailResponse.getData().getHotelInfo());
-        goodsInfo.set("hotlOrderId", addOrderResponse.getData().getOrderId());
+        goodsInfo.set("channelOrderId", String.valueOf(addOrderResponse.getData().getOrderId()));
         goodsInfo.set("goodsName", addOrderRequest.getRoomNameCn());
         goodsInfo.set("goodsPath", addOrderRequest.getRoomPic());
         goodsInfo.set("ratePlan", ratePlanResponse);
@@ -194,7 +194,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
     }
 
     public ResultContent<OrderDetailResponse> orderDetail(OrderDetailRequest orderDetailRequest) {
-        ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.dfyHotelOrder(orderDetailRequest.getOrderId());
+        ResultContent<GoodsResultModel> goodsResultModelResultContent =  orderService2.findChannelGoods(JobFlowMap.Hotel,String.valueOf(orderDetailRequest.getOrderId()));
         GoodsResultModel goodsResultModel = goodsResultModelResultContent.getContent();
         OrderDetailResponse orderDetailResponse = domesticHotelApi.orderDetail(orderDetailRequest);
         if (orderDetailResponse.getSuccess()) {

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

@@ -135,7 +135,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
         createOrder2Model.setAccesserUserId(authAccount);
         createOrder2Model.setChannel(createOrderNewRequest.getChannel());
         JSONObject goodsInfo = JSONUtil.parseObj(createOrderNewRequest2);
-        goodsInfo.set("tickeOrderId", createOrderNewResponse.getData().getOrderId());
+        goodsInfo.set("channelOrderId", String.valueOf(createOrderNewResponse.getData().getOrderId()));
         goodsInfo.set("goodsName", detailResponse.getData().getProductName());
         goodsInfo.set("goodsPath", scenicDetailResponse.getData().getDefaultPic());
         goodsInfo.set("scenicId", createOrderNewRequest.getScenicId());
@@ -196,7 +196,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
 
 
     public ResultContent<OrderDetailResponse> orderDetail(OrderDetailRequest orderDetailRequest) {
-        ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.dfyTicktOrder(orderDetailRequest.getOrderId());
+        ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.findChannelGoods(JobFlowMap.Ticket, String.valueOf(orderDetailRequest.getOrderId()));
         GoodsResultModel goodsResultModel = goodsResultModelResultContent.getContent();
         OrderDetailResponse orderDetailResponse = ticketApi.orderDetail(orderDetailRequest);
         if (orderDetailResponse.getSuccess()) {
@@ -270,7 +270,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
             paymentService2.applicantRefund(applicantRefundParam2Model);
         }
 
-        return tuiPiaoResponse.getSuccess()? ResultContent.buildContent(tuiPiaoResponse):ResultContent.build(ResultState.Fail, tuiPiaoResponse.getMsg());
+        return tuiPiaoResponse.getSuccess() ? ResultContent.buildContent(tuiPiaoResponse) : ResultContent.build(ResultState.Fail, tuiPiaoResponse.getMsg());
 
     }