gongfuzhu 1 年之前
父節點
當前提交
2566f6c705

+ 2 - 13
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarVerificationJob.java

@@ -50,20 +50,11 @@ public class StandarVerificationJob {
     AuthHelper authHelper;
 
 
-    public Step verificationCheck() {
-        return stepBuilderFactory.get("verificationCheck")
-                .tasklet((contribution, chunkContext) -> {
-
-                    return RepeatStatus.FINISHED;
-                })
-                .build();
-    }
-
     public Step standardVerificationStep() {
         return stepBuilderFactory.get("standardVerificationStep")
                 .tasklet((contribution, chunkContext) -> {
 
-
+                    getResultContent().remove();
 
                     VerificationModel verificationModel = getParameter().get();
                     String enterPriseId = authHelper.getEnterPriseId();
@@ -97,7 +88,6 @@ public class StandarVerificationJob {
                     }
 
 
-
                     ResultContent<SubOrdersConfirmResponseModel> resultContent = paymentService2.subOrdersConfirm(verificationModel.getId(), verificationModel.getShopId());
                     if (!resultContent.getState().equals(ResultState.Success)) {
                         getResultContent().set(resultContent);
@@ -113,8 +103,7 @@ public class StandarVerificationJob {
     public Job standardVerificationJob() {
         return getJobBuilderFactory()
                 .get("standardVerificationJob")
-                .start(verificationCheck())
-                .next(standardVerificationStep())
+                .start(standardVerificationStep())
                 .incrementer(new RunIdIncrementer())
                 .build();
     }

+ 1 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/OrderServiceImp.java

@@ -159,7 +159,7 @@ public class OrderServiceImp implements OrderService {
         JobParameters parameters = new JobParametersBuilder(jobExplorer)
                 .getNextJobParameters(job)
                 .toJobParameters();
-        jobLauncher.run(job, parameters).getExitStatus();
+        jobLauncher.run(job, parameters);
         return standarVerificationJob.getResultContent().get();