修改发货流程,支付的时候出票

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/dfy/TicketDeliveryJob.java

@@ -56,39 +56,39 @@ public class TicketDeliveryJob {
         return getStepBuilderFactory().get("ticketDeliveryStep")
                 .tasklet((contribution, chunkContext) -> {
                     GoodsResultModel goodsResultModel = getParameter().get();
-//                    ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.orderInfo(goodsResultModel.getOrderNo());
-//                    BigDecimal payAmount = goodsResultModelResultContent.getContent().getPayAmount();
-
-
-//                    JSONObject entries = JSONUtil.parseObj(goodsResultModel.getExtend());
-//                    String orderId = (String) entries.get("orderId");
-
-//                    SubmitOrderRequest submitOrderRequest = new SubmitOrderRequest();
-//                    submitOrderRequest.setPay(payAmount);
-//                    submitOrderRequest.setPayType(payType);
-//                    submitOrderRequest.setOrderId(orderId);
-
-//                    SubmitOrderResponse submitOrderResponse = ticketApi.submitOrderResponse(submitOrderRequest);
-//
-//
-//                    String extend = goodsResultModel.getExtend();
-//                    JSONObject entries1 = JSONUtil.parseObj(extend);
-//                    entries1.set("response", submitOrderResponse);
-//                    if (!submitOrderResponse.getSuccess()) {
-//                        UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
-//                        updateGoodsModel.setId(goodsResultModel.getId());
-//                        updateGoodsModel.setVerifyModel(entries1);
-//                        orderService2.updateGoods(updateGoodsModel);
-//                        return RepeatStatus.FINISHED;
-//                    }
-//
-//                    // 分账
-//                    ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(goodsResultModel.getId(), goodsResultModel.getShopId());
-//                    if (!subOrdersConfirmResponseModelResultContent.getState().equals(ResultState.Success)) {
-//                        log.info("分账失败：{}", JSONUtil.toJsonStr(goodsResultModel));
-//                        getResultContent().set(ResultContent.build(ResultState.Fail));
-//                        return RepeatStatus.FINISHED;
-//                    }
+                    ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.orderInfo(goodsResultModel.getOrderNo());
+                    BigDecimal payAmount = goodsResultModelResultContent.getContent().getPayAmount();
+
+
+                    JSONObject entries = JSONUtil.parseObj(goodsResultModel.getExtend());
+                    String orderId = (String) entries.get("orderId");
+
+                    SubmitOrderRequest submitOrderRequest = new SubmitOrderRequest();
+                    submitOrderRequest.setPay(payAmount);
+                    submitOrderRequest.setPayType(payType);
+                    submitOrderRequest.setOrderId(orderId);
+
+                    SubmitOrderResponse submitOrderResponse = ticketApi.submitOrderResponse(submitOrderRequest);
+
+
+                    String extend = goodsResultModel.getExtend();
+                    JSONObject entries1 = JSONUtil.parseObj(extend);
+                    entries1.set("response", submitOrderResponse);
+                    if (!submitOrderResponse.getSuccess()) {
+                        UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
+                        updateGoodsModel.setId(goodsResultModel.getId());
+                        updateGoodsModel.setVerifyModel(entries1);
+                        orderService2.updateGoods(updateGoodsModel);
+                        return RepeatStatus.FINISHED;
+                    }
+
+                    // 分账
+                    ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(goodsResultModel.getId(), goodsResultModel.getShopId());
+                    if (!subOrdersConfirmResponseModelResultContent.getState().equals(ResultState.Success)) {
+                        log.info("分账失败：{}", JSONUtil.toJsonStr(goodsResultModel));
+                        getResultContent().set(ResultContent.build(ResultState.Fail));
+                        return RepeatStatus.FINISHED;
+                    }
 
 
                     UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();