|
@@ -55,22 +55,39 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
private PaymentService2 paymentService2;
|
|
|
|
|
|
public ResultContent<ScenicListResponse> scenicList(ScenicListRequest scenicListRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.scenicList(scenicListRequest));
|
|
|
+ ScenicListResponse scenicListResponse = ticketApi.scenicList(scenicListRequest);
|
|
|
+ if (scenicListResponse.getSuccess()) {
|
|
|
+ return ResultContent.buildContent(scenicListResponse);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, scenicListResponse);
|
|
|
}
|
|
|
|
|
|
|
|
|
public ResultContent<ScenicDetailResponse> scenicDetail(ScenicDetailRequest scenicDetailRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.scenicDetail(scenicDetailRequest));
|
|
|
+ ScenicDetailResponse scenicDetailResponse = ticketApi.scenicDetail(scenicDetailRequest);
|
|
|
+ if (scenicDetailResponse.getSuccess()) {
|
|
|
+ return ResultContent.buildContent(scenicDetailResponse);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, scenicDetailResponse);
|
|
|
}
|
|
|
|
|
|
|
|
|
public ResultContent<PrivilegeTicketListResponse> privilegeTicketList(PrivilegeTicketListRequest privilegeTicketListRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.privilegeTicketList(privilegeTicketListRequest));
|
|
|
+
|
|
|
+ PrivilegeTicketListResponse privilegeTicketListResponse = ticketApi.privilegeTicketList(privilegeTicketListRequest);
|
|
|
+ if (privilegeTicketListResponse.getSuccess()) {
|
|
|
+ return ResultContent.buildContent(privilegeTicketListResponse);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, privilegeTicketListResponse);
|
|
|
}
|
|
|
|
|
|
|
|
|
public ResultContent<DetailResponse> detail(DetailRequest detailRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.detail(detailRequest));
|
|
|
+ DetailResponse detail = ticketApi.detail(detailRequest);
|
|
|
+ if (detail.getSuccess()) {
|
|
|
+ return ResultContent.buildContent(detail);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, detail);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -119,6 +136,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
goodsInfo.set("goodsName", detailResponse.getData().getProductName());
|
|
|
goodsInfo.set("goodsPath", scenicDetailResponse.getData().getDefaultPic());
|
|
|
goodsInfo.set("scenicId", createOrderNewRequest.getScenicId());
|
|
|
+ goodsInfo.set("salePrice",salePrice);
|
|
|
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
|
goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
|
|
@@ -172,14 +190,22 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
|
|
|
|
|
|
public ResultContent<OrderDetailResponse> orderDetail(OrderDetailRequest orderDetailRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.orderDetail(orderDetailRequest));
|
|
|
-
|
|
|
+ OrderDetailResponse orderDetailResponse = ticketApi.orderDetail(orderDetailRequest);
|
|
|
+ if (orderDetailResponse.getSuccess()) {
|
|
|
+ return ResultContent.buildContent(orderDetailResponse);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, orderDetailResponse);
|
|
|
}
|
|
|
|
|
|
|
|
|
public ResultContent<OrderStatusResponse> orderStatus(OrderStatusRequest orderStatusRequest) {
|
|
|
- return ResultContent.buildContent(ticketApi.orderStatus(orderStatusRequest));
|
|
|
|
|
|
+ OrderStatusResponse orderStatusResponse = ticketApi.orderStatus(orderStatusRequest);
|
|
|
+ if (orderStatusResponse.getSuccess()) {
|
|
|
+
|
|
|
+ return ResultContent.buildContent(orderStatusResponse);
|
|
|
+ }
|
|
|
+ return ResultContent.build(ResultState.Fail, orderStatusResponse);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -197,7 +223,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
|
Integer orderId = bean.getOrderId();
|
|
|
tuiPiaoRequest.setOrderId(String.valueOf(orderId));
|
|
|
TuiPiaoResponse tuiPiaoResponse = ticketApi.tuiPiao(tuiPiaoRequest);
|
|
|
- if (tuiPiaoResponse.getSuccess()){
|
|
|
+ if (tuiPiaoResponse.getSuccess()) {
|
|
|
ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
|
|
|
applicantRefundParam2Model.setUserId(authHelper.getCurrentUser().getUserId());
|
|
|
applicantRefundParam2Model.setId(goodsResultModel.getId());
|