gongfuzhu před 1 rokem
rodič
revize
f7346bd29d

+ 1 - 1
SpringBatchServiceServer/pom.xml

@@ -104,7 +104,7 @@
             <artifactId>oil-core</artifactId>
             <version>1.0.16</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/oil-sdk-jar-1.0.16.jar</systemPath>
+            <systemPath>${basedir}/src/main/java/com/zswl/cloud/springBtach/server/lib/oil-sdk-jar-1.0.16.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.github.microservice.components</groupId>

+ 22 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/sdk/domain/ItemPriceInfoForCallback.java

@@ -0,0 +1,22 @@
+
+package com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ItemPriceInfoForCallback {
+    private String itemId;
+    private String itemName;
+    private Integer cityPrice;
+    private Integer storePrice;
+    private Integer vipPrice;
+    private List<String> gunNoList;
+    private List<TagVO> tagList;
+
+}

+ 18 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/sdk/domain/TagVO.java

@@ -0,0 +1,18 @@
+
+package com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TagVO {
+    private Integer type;
+    private Integer location;
+    private Integer iconType;
+    private String title;
+    private String longTitle;
+
+}

+ 2 - 2
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/sdk/request/QueryNewOrderRequest.java

@@ -21,8 +21,8 @@ public class QueryNewOrderRequest extends OpenRequest {
     private String storeId;
     private long itemId;
     private String gunNo;
-    private Integer originalAmount;
-    private Integer paymentAmount;
+    private Integer orderAmount;
+    private Integer realAmount;
     private Integer serviceFee;
     private Integer litre;
     private Integer vipPrice;

+ 15 - 7
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -1,7 +1,16 @@
 package com.zswl.cloud.springBtach.server.core.controller;
 
+import com.github.microservice.auth.client.content.ResultContent;
+import com.github.microservice.auth.security.annotations.ResourceAuth;
+import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.model.payment.CreateResponseModel;
+import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
+import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.NotificationPushStoreInfoRequest;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @Log4j2
@@ -10,14 +19,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class XiaoJuController {
 
 
+    @ApiOperation("同步加油站信息")
+    @RequestMapping(value = "receivingGasStation", method = RequestMethod.POST)
+    public String receivingGasStation(@RequestBody NotificationPushStoreInfoRequest notificationPushStoreInfoRequest) {
 
-
-
-
-
-
-
-
+        log.info("同步加油站信息:{}", notificationPushStoreInfoRequest);
+        return "ddddddd";
+    }
 
 
 }

+ 12 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarPayJob.java

@@ -0,0 +1,12 @@
+package com.zswl.cloud.springBtach.server.core.job.standard;
+
+import lombok.Data;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@Log4j2
+public class StandarPayJob {
+
+}

+ 49 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/video/VideoOrderJob.java

@@ -0,0 +1,49 @@
+package com.zswl.cloud.springBtach.server.core.job.video;
+
+import com.github.microservice.auth.client.content.ResultContent;
+import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
+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 VideoOrderJob {
+    @Autowired
+    @Delegate
+    StandarOrderJob standarOrderJob;
+
+
+    public Step videoOrderStep() {
+        return getStepBuilderFactory().get("videoOrderStep").tasklet((it, ii) -> {
+
+            ThreadLocal<CreateOrder2Model> parameter = getParameter();
+
+
+            ResultContent creat = getOrderService2().creat(getParameter().get());
+
+            getResultContent().set(creat);
+            return RepeatStatus.FINISHED;
+        }).build();
+
+    }
+
+
+    @Bean
+    public Job videoOrder() {
+        return getJobBuilderFactory()
+                .get("videoOrder")
+                .start(videoOrderStep())
+                .incrementer(new RunIdIncrementer())
+                .build();
+    }
+}

+ 0 - 0
SpringBatchServiceServer/src/main/resources/lib/oil-sdk-jar-1.0.16.jar → SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/lib/oil-sdk-jar-1.0.16.jar