|
@@ -7,6 +7,7 @@ import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
|
import com.zhongshu.payment.client.model.payment.zswl.CreatePayment2Model;
|
|
|
import com.zhongshu.payment.client.service.v2.OrderService2;
|
|
|
import com.zhongshu.payment.client.service.v2.PaymentService2;
|
|
|
+import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
|
|
|
import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrdereResponse;
|
|
|
import com.zswl.cloud.springBatch.client.model.ypp.response.OrderDetailResponse;
|
|
|
import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
|
|
@@ -45,7 +46,7 @@ public class YppPayJob {
|
|
|
|
|
|
|
|
|
public Step yppPayStep() {
|
|
|
- return getStepBuilderFactory().get("hotelPayStep")
|
|
|
+ return getStepBuilderFactory().get("yppPayStep")
|
|
|
.tasklet((contribution, chunkContext) -> {
|
|
|
CreatePayment2Model createPayment2Model = standarPayJob.getParameter().get();
|
|
|
|
|
@@ -53,8 +54,8 @@ public class YppPayJob {
|
|
|
GoodsResultModel goodsResultModel = listResultContent.getContent().get(0);
|
|
|
String extend = goodsResultModel.getExtend();
|
|
|
|
|
|
- CreateOrdereResponse bean = JSONUtil.toBean(extend, CreateOrdereResponse.class);
|
|
|
- OrderDetailResponse orderDetailResponse = yppApi.order_detail(bean.getData());
|
|
|
+ CreateOrder2Response bean = JSONUtil.toBean(extend, CreateOrder2Response.class);
|
|
|
+ OrderDetailResponse orderDetailResponse = yppApi.order_detail(bean.getData().getOrderId());
|
|
|
if (!orderDetailResponse.getData().getCanPay()) {
|
|
|
standarPayJob.getResultContent().set(ResultContent.build(ResultState.Fail, "渠道订单无法支付"));
|
|
|
return RepeatStatus.FINISHED;
|