|
@@ -114,10 +114,15 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
|
|
|
// 渠道订单
|
|
|
CreateOrderNewResponse createOrderNewResponse = ticketApi.createOrderNew(createOrderNewRequest2);
|
|
|
+
|
|
|
if (!createOrderNewResponse.getSuccess()) {
|
|
|
return ResultContent.build(ResultState.Fail, createOrderNewResponse.getMsg());
|
|
|
}
|
|
|
|
|
|
+ OrderDetailRequest orderDetailRequest = new OrderDetailRequest();
|
|
|
+ orderDetailRequest.setOrderId(createOrderNewResponse.getData().getOrderId());
|
|
|
+ OrderDetailResponse orderDetailResponse = ticketApi.orderDetail(orderDetailRequest);
|
|
|
+
|
|
|
// 平台订单
|
|
|
CreateOrder2Model createOrder2Model = new CreateOrder2Model();
|
|
|
createOrder2Model.setOrderNo(orderNo);
|
|
@@ -136,6 +141,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
goodsInfo.set("scenicId", createOrderNewRequest.getScenicId());
|
|
|
goodsInfo.set("salePrice", salePrice);
|
|
|
|
|
|
+
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
|
goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
|
|
|
goods.setJobFlowMap(JobFlowMap.Ticket);
|
|
@@ -158,7 +164,9 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
ownerList.add(platfor);
|
|
|
ownerList.add(buy);
|
|
|
goods.setTransferRrule(ownerList);
|
|
|
- goods.setExtend(JSONUtil.toJsonStr(createOrderNewResponse.getData()));
|
|
|
+ JSONObject entries = JSONUtil.parseObj(createOrderNewResponse.getData());
|
|
|
+ entries.put("orderInfo", orderDetailResponse.getData().getOrderInfo());
|
|
|
+ goods.setExtend(JSONUtil.toJsonStr(entries));
|
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
|
return orderService2.creat(createOrder2Model);
|
|
|
}
|
|
@@ -194,6 +202,12 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
if (orderDetailResponse.getSuccess()) {
|
|
|
String orderStatus = orderDetailResponse.getData().getOrderStatus();
|
|
|
|
|
|
+ String extend = goodsResultModel.getExtend();
|
|
|
+ JSONObject entries = JSONUtil.parseObj(extend);
|
|
|
+ entries.put("orderInfo", orderDetailResponse.getData());
|
|
|
+ UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
+ updateGoodsModel.setId(goodsResultModel.getId());
|
|
|
+ updateGoodsModel.setExtend(JSONUtil.toJsonStr(entries));
|
|
|
switch (orderStatus) {
|
|
|
case "已取消":
|
|
|
switch (goodsResultModel.getGoodsState()) {
|
|
@@ -202,9 +216,6 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
updateOrder2Model.setOrderType(OrderType.CLOSE);
|
|
|
updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
|
|
|
orderService2.updateOrderType(updateOrder2Model);
|
|
|
- UpdateGoodsModel updateGoodsModel1 = new UpdateGoodsModel();
|
|
|
- updateGoodsModel1.setGoodsState(OrderType.CLOSE);
|
|
|
- orderService2.updateGoods(updateGoodsModel1);
|
|
|
break;
|
|
|
case WAIT_USE:
|
|
|
ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
|
|
@@ -214,16 +225,12 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
paymentService2.applicantRefund(applicantRefundParam2Model);
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
return ResultContent.buildContent(orderDetailResponse);
|
|
|
case "已完成":
|
|
|
- UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
|
|
|
updateGoodsModel.setGoodsState(OrderType.USED);
|
|
|
- orderService2.updateGoods(updateGoodsModel);
|
|
|
break;
|
|
|
-
|
|
|
}
|
|
|
+ orderService2.updateGoods(updateGoodsModel);
|
|
|
return ResultContent.buildContent(orderDetailResponse);
|
|
|
}
|
|
|
return ResultContent.build(ResultState.Fail, orderDetailResponse.getMsg());
|