支付宝退款主动查询处理结果

liquidnet-bus-feign/liquidnet-api-feign-platform/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-bus-feign</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-api-feign-platform</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+    </dependencies>
+
+</project>
\ No newline at end of file

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/kylin/task/FeignPlatformAlipayBackClient.java

+package com.liquidnet.service.feign.kylin.task;
+
+import com.liquidnet.service.base.ResponseDto;
+import feign.hystrix.FallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Component
+@FeignClient(name = "liquidnet-service-platform",
+        contextId = "FeignPlatformAlipayBackClient", path = "",
+        url = "",
+        fallback = FallbackFactory.Default.class)
+public interface FeignPlatformAlipayBackClient {
+
+    @GetMapping("platform/refund/alipayActiveCallback")
+    ResponseDto<String> alipayActiveCallback();
+
+}

liquidnet-bus-feign/pom.xml

@@ -14,6 +14,7 @@
         <module>liquidnet-api-feign-adam</module>
         <module>liquidnet-api-feign-kylin</module>
         <module>liquidnet-api-feign-dragon</module>
+        <module>liquidnet-api-feign-platform</module>
 <!--        <module>liquidnet-api-feign-sequence</module>-->
 <!--        <module>liquidnet-api-feign-example</module>-->
 <!--        <module>liquidnet-api-feign-account</module>-->

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/pom.xml

@@ -26,6 +26,12 @@
             <artifactId>liquidnet-api-feign-dragon</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-platform</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformTaskHandler.java

+package com.liquidnet.service.executor.main.handler;
+
+import com.liquidnet.service.feign.kylin.task.FeignPlatformAlipayBackClient;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Platform
+ */
+@Component
+public class PlatformTaskHandler {
+    private static final Logger log = LoggerFactory.getLogger(PlatformTaskHandler.class);
+
+    @Autowired
+    private FeignPlatformAlipayBackClient feignPlatformAlipayBackClient;
+
+    @XxlJob(value = "sev-platform:alipayActiveCallbackHandler")
+    public ReturnT<String> alipayActiveCallbackHandler() {
+        try {
+            String result = feignPlatformAlipayBackClient.alipayActiveCallback().getData();
+            log.info("alipayActiveCallback：结果："+result);
+            return ReturnT.SUCCESS;
+        } catch (Exception e) {
+            return ReturnT.FAIL;
+        }
+    }
+
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -118,18 +118,22 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     }
 
     public String alipayActiveCallback() {
+        LocalDateTime startTime =  LocalDateTime.now();
+        LocalDateTime newTime = startTime.minusHours(8);
         List<KylinOrderRefunds> kylinOrderRefunds = kylinOrderRefundsMapper.selectList(
                 Wrappers.lambdaQuery(KylinOrderRefunds.class)
                         .eq(KylinOrderRefunds::getStatus, KylinTableStatusConst.ORDER_REFUND_STATUS_UNFILLED)
+                        .lt(KylinOrderRefunds::getExecutorAt, newTime) // 默认减去8小时的
         );
         for (KylinOrderRefunds refundInfo : kylinOrderRefunds) {
             KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                     Wrappers.lambdaQuery(KylinOrderTickets.class)
                             .eq(KylinOrderTickets::getOrderTicketsId, refundInfo.getOrderTicketsId())
             );
-            if (orderInfo.getPaymentType().equals("WAPALIPAY") || orderInfo.getPaymentType().equals("APPALIPAY")) {
+            if (null != orderInfo.getPaymentType() && (orderInfo.getPaymentType().equals("WAPALIPAY") || orderInfo.getPaymentType().equals("APPALIPAY"))) {
+                log.info("\n支付宝退款主动查询处理结果：\n[{}] ", orderInfo.getOrderTicketsId());
                 MultiValueMap<String, String> params = new LinkedMultiValueMap();
-                params.add("notifyUrl", platformUrl.concat("/platform/refund/callback"));
+                params.add("callBackUrl", platformUrl.concat("/platform/refund/callback"));
                 params.add("orderCode", orderInfo.getOrderCode());
                 params.add("orderRefundCode", refundInfo.getOrderRefundCode());
                 params.add("paymentId", orderInfo.getPaymentId());
@@ -143,6 +147,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                 } catch (Exception e) {
                     log.info("\n支付宝退款主动查询失败：[errorMsg=[{}], [orderRefundsId=[{}]", e.getMessage(), refundInfo.getOrderRefundsId());
                 }
+
             }
         }
         return "success";