新增订单 Model调整

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/cline/service/OrderService.java

@@ -1,7 +1,7 @@
 package com.zswl.cloud.springBatch.cline.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
-import com.zhongshu.payment.client.model.order.CreateOrderModel;
+import com.zhongshu.payment.client.model.order.CreateOrder2Model;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 public interface OrderService {
     @ApiOperation("创建订单")
     @RequestMapping(value = "creat", method = RequestMethod.POST, consumes = {MediaType.ALL_VALUE})
-    ResultContent creat(CreateOrderModel createOrderModel);
+    ResultContent creat(CreateOrder2Model createOrderModel);
 
 
 }

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

@@ -1,7 +1,7 @@
 package com.zswl.cloud.springBtach.server.core.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
-import com.zhongshu.payment.client.model.order.CreateOrderModel;
+import com.zhongshu.payment.client.model.order.CreateOrder2Model;
 import com.zswl.cloud.springBatch.cline.service.OrderService;
 import com.zswl.cloud.springBtach.server.core.step.CreateOrderStep;
 import lombok.SneakyThrows;
@@ -33,8 +33,8 @@ public class OrderServiceImp implements OrderService {
 
     @Override
     @SneakyThrows
-    public ResultContent creat(CreateOrderModel createOrderModel) {
-        ThreadLocal<CreateOrderModel> parameter = createOrderStep.getParameter();
+    public ResultContent creat(CreateOrder2Model createOrderModel) {
+        ThreadLocal<CreateOrder2Model> parameter = createOrderStep.getParameter();
         parameter.set(createOrderModel);
         JobParameters parameters = new JobParametersBuilder(jobExplorer)
                 .getNextJobParameters(creatOrder)

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/step/CreateOrderStep.java

@@ -3,7 +3,7 @@ package com.zswl.cloud.springBtach.server.core.step;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.helper.AuthHelper;
-import com.zhongshu.payment.client.model.order.CreateOrderModel;
+import com.zhongshu.payment.client.model.order.CreateOrder2Model;
 import com.zhongshu.payment.client.service.OrderService2;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
@@ -36,7 +36,7 @@ public class CreateOrderStep {
 
     ThreadLocal<ResultContent> resultContent = new ThreadLocal<>();
 
-    ThreadLocal<CreateOrderModel> parameter = new ThreadLocal<>();
+    ThreadLocal<CreateOrder2Model> parameter = new ThreadLocal<>();
 
 
     @Resource