恢复支付宝

mcwl-pay/src/main/java/com/mcwl/pay/config/AliConfig.java

@@ -3,7 +3,6 @@ package com.mcwl.pay.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 

mcwl-pay/src/main/java/com/mcwl/pay/service/AliPayService.java

@@ -1,12 +1,10 @@
 package com.mcwl.pay.service;
 
 import com.alipay.api.AlipayApiException;
-import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.pay.domain.OrderTradeDto;
 import com.mcwl.pay.domain.vo.PayVo;
 
-import javax.validation.constraints.NotNull;
 import java.io.FileNotFoundException;
 
 public interface AliPayService {

mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java

@@ -2,7 +2,6 @@ package com.mcwl.pay.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.extra.mail.MailUtil;
 import cn.hutool.json.JSONUtil;
@@ -11,16 +10,12 @@ import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.AlipayConfig;
 import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.AlipayFundAccountQueryModel;
 import com.alipay.api.domain.AlipayFundTransUniTransferModel;
 import com.alipay.api.domain.AlipayTradeQueryModel;
 import com.alipay.api.domain.Participant;
-import com.alipay.api.internal.util.file.IOUtils;
-import com.alipay.api.request.AlipayFundAccountQueryRequest;
 import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.request.AlipaySystemOauthTokenRequest;
 import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.response.AlipayFundAccountQueryResponse;
 import com.alipay.api.response.AlipayFundTransUniTransferResponse;
 import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.alipay.api.response.AlipayTradeQueryResponse;
@@ -28,10 +23,7 @@ import com.alipay.easysdk.factory.Factory;
 import com.alipay.easysdk.kernel.Config;
 import com.alipay.easysdk.payment.common.models.AlipayTradeCancelResponse;
 import com.alipay.easysdk.payment.facetoface.models.AlipayTradePrecreateResponse;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import com.mcwl.common.JSONUtils;
 import com.mcwl.common.constant.HttpStatus;
-import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.common.core.domain.entity.SysUser;
 import com.mcwl.common.core.redis.RedisCache;
@@ -58,12 +50,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ResourceUtils;
 
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 

mcwl-pay/src/main/java/com/mcwl/pay/task/PayTask.java

@@ -1,45 +1,40 @@
-//package com.mcwl.pay.task;
+package com.mcwl.pay.task;
-//
+
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mcwl.pay.domain.OrderTrade;
-//import com.mcwl.common.constant.QueueConstants;
+import com.mcwl.pay.service.OrderTradeService;
-//import com.mcwl.memberCenter.domain.Member;
+import lombok.RequiredArgsConstructor;
-//import com.mcwl.pay.domain.OrderTrade;
+import org.joda.time.LocalDateTime;
-//import com.mcwl.pay.service.AliPayService;
+import org.springframework.stereotype.Component;
-//import com.mcwl.pay.service.OrderTradeService;
+
-//import lombok.RequiredArgsConstructor;
+import java.util.Date;
-//import org.joda.time.LocalDateTime;
+import java.util.List;
-//import org.springframework.stereotype.Component;
+
-//
+@Component("payTask")
-//import java.util.Date;
+@RequiredArgsConstructor
-//import java.util.List;
+public class PayTask {
-//import java.util.function.Consumer;
+
-//
+    private final OrderTradeService orderTradeService;
-//@Component("payTask")
+
-//@RequiredArgsConstructor
+
-//public class PayTask {
+    /**
-//
+     * 删除失效订单 间隔1h检查 0 0 0/1 * * ?
-//    private final OrderTradeService orderTradeService;
+     */
-//
+    public void deleteInvalidOrderTask() {
-//
+
-//    /**
+        Date date = LocalDateTime.now().plusMinutes(-15).toDate();
-//     * 删除失效订单 间隔1h检查 0 0 0/1 * * ?
+
-//     */
+        List<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
-//    public void deleteInvalidOrderTask() {
+                .le(OrderTrade::getCreateTime, date)
-//
+                .and(wrapper -> wrapper
-//        Date date = LocalDateTime.now().plusMinutes(-15).toDate();
+                        .eq(OrderTrade::getOrderStatus, 4)
-//
+                        .or()
-//        List<OrderTrade> orderTradeList = orderTradeService.lambdaQuery()
+                        .eq(OrderTrade::getPayStatus, 1)
-//                .le(OrderTrade::getCreateTime, date)
+                )
-//                .and(wrapper -> wrapper
+                .list();
-//                        .eq(OrderTrade::getOrderStatus, 4)
+
-//                        .or()
+        orderTradeService.removeBatchByIds(orderTradeList);
-//                        .eq(OrderTrade::getPayStatus, 1)
+
-//                )
+    }
-//                .list();
+
-//
+
-//        orderTradeService.removeBatchByIds(orderTradeList);
+}
-//
-//    }
-//
-//
-//}