优化

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/pcod/PcodeDeliveryJob.java

@@ -0,0 +1,48 @@
+package com.zswl.cloud.springBtach.server.core.job.pcod;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.client.content.ResultState;
+import com.zswl.cloud.springBtach.server.core.job.standard.StandarDeliveryJob;
+import lombok.Data;
+import lombok.experimental.Delegate;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Log4j2
+@Configuration
+public class PcodeDeliveryJob  {
+
+    @Autowired
+    @Delegate
+    StandarDeliveryJob standarDeliveryJob;
+
+    public Step pcodDeliveryStep() {
+
+        return getStepBuilderFactory().get("pcodDeliveryStep").tasklet((it,ii)->{
+
+            log.info("二维码订单已支付");
+            getResultContent().set(ResultContent.build(ResultState.Success));
+            return RepeatStatus.FINISHED;
+
+        }).build();
+
+
+    }
+
+    @Bean
+    public Job pcod111DeliveryJob() {
+        return getJobBuilderFactory()
+                .get("pcod111DeliveryJob")
+                .start(pcodDeliveryStep())
+                .incrementer(new RunIdIncrementer())
+                .build();
+    }
+
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/pcod/PcodeOrderJob.java

@@ -0,0 +1,45 @@
+package com.zswl.cloud.springBtach.server.core.job.pcod;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zswl.cloud.springBtach.server.core.job.standard.StandarOrderJob;
+import lombok.Data;
+import lombok.experimental.Delegate;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Log4j2
+@Configuration
+public class PcodeOrderJob {
+
+    @Autowired
+    @Delegate
+    StandarOrderJob standarOrderJob;
+
+    public Step pcodPlatformOrder() {
+        return getStepBuilderFactory().get("pcodPlatformOrder").tasklet((it, ii) -> {
+            ResultContent creat = getOrderService2().creat(getParameter().get());
+
+            getResultContent().set(creat);
+            return RepeatStatus.FINISHED;
+        }).build();
+
+    }
+
+
+    @Bean
+    public Job pcodCreatOrder() {
+        return getJobBuilderFactory()
+                .get("pcodCreatOrder")
+                .start(pcodPlatformOrder())
+                .incrementer(new RunIdIncrementer())
+                .build();
+    }
+
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/pcod/PcodeVerificationJob.java

@@ -0,0 +1,42 @@
+package com.zswl.cloud.springBtach.server.core.job.pcod;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.client.content.ResultState;
+import com.zswl.cloud.springBtach.server.core.job.standard.StandarVerificationJob;
+import lombok.Data;
+import lombok.experimental.Delegate;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Log4j2
+@Configuration
+public class PcodeVerificationJob {
+
+    @Autowired
+    @Delegate
+    StandarVerificationJob standarVerificationJob;
+
+    public Step pcodeVerificationStep() {
+
+
+        return getStepBuilderFactory().get("pcodeVerificationStep").tasklet((it, ii) -> {
+            getResultContent().set(ResultContent.build(ResultState.Fail, "二维码商品不需要核销"));
+            return RepeatStatus.FINISHED;
+        }).build();
+    }
+
+    @Bean
+    public Job pcodVerificationJob() {
+        return getJobBuilderFactory().get("pcodeVerificationJob")
+                .start(pcodeVerificationStep())
+                .incrementer(new RunIdIncrementer())
+                .build();
+    }
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarDeliveryJob.java

@@ -2,8 +2,6 @@ package com.zswl.cloud.springBtach.server.core.job.standard;
 
 import com.github.microservice.auth.client.content.ResultContent;
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
-import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
-import com.zhongshu.payment.client.model.order.v2.OrderStremModel;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zswl.cloud.shop.client.dto.life.OperateStockDto;
 import com.zswl.cloud.shop.client.ret.ResultState;
@@ -21,7 +19,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @Data
 @Log4j2

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/stream/OrderStream.java

@@ -9,6 +9,7 @@ import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.JobFlowType;
 import com.zhongshu.payment.client.type.OrderType;
+import com.zswl.cloud.shop.client.dto.life.OperateStockDto;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarDeliveryJob;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
@@ -62,10 +63,9 @@ public class OrderStream extends StreamConsumer<OrderStremModel> {
                 jobLauncher.run(job, parameters).getExitStatus();
                 ThreadLocal<ResultContent> resultContent = standarDeliveryJob.getResultContent();
                 Assert.isTrue(resultContent.get().getState().equals(ResultState.Success), "发货失败");
-
                 orderService2.delivery(goodsResultModel.getId());
-
-
+            }else if (OrderType.WAIT_PAYMENT.equals(orderStremModel.getOrderType())) {
+                //todo 暂存
             }