修改发货流程

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

@@ -56,51 +56,45 @@ 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();
+//                    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;
+//                    }
 
 
-                    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;
-                    }
-
-
-                    VerificationModel verificationModel = new VerificationModel();
-                    verificationModel.setId(goodsResultModel.getId());
-                    verificationModel.setShopId(goodsResultModel.getShopId());
-                    verificationModel.setVerification(new JSONObject());
                     UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
                     updateGoodsModel.setId(goodsResultModel.getId());
                     updateGoodsModel.setDelivery(true);
-                    updateGoodsModel.setVerifyModel(entries1);
                     updateGoodsModel.setGoodsState(OrderType.WAIT_USE);
-                    updateGoodsModel.setVerifyModel(JSONUtil.parseObj(verificationModel));
                     orderService2.updateGoods(updateGoodsModel);
 
                     getResultContent().set(ResultContent.build(ResultState.Success));