1、接入paypal

2、修改支付宝支付

src/main/java/com/ai/da/controller/AliPayController.java

@@ -1,20 +1,13 @@
 package com.ai.da.controller;
 
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.ai.da.service.AliPayService;
-import com.ai.da.service.OrderInfoService;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayConstants;
-import com.alipay.api.internal.util.AlipaySignature;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.Map;
 
 @CrossOrigin
@@ -27,18 +20,9 @@ public class AliPayController {
     @Resource
     private AliPayService aliPayService;
 
-    @Resource
-    private Environment config;
-
-    @Resource
-    private OrderInfoService orderInfoService;
-
     @ApiOperation("统一收单下单并支付页面接口的调用")
     @PostMapping("/trade/page/pay/{productId}")
     public Response<String> tradePagePay(@PathVariable Long productId,@RequestParam String returnUrl){
-
-        System.out.println(productId + " " + returnUrl);
-
         log.info("统一收单下单并支付页面接口的调用");
         //支付宝开放平台接受 request 请求对象后
         // 会为开发者生成一个html 形式的 form表单，包含自动提交的脚本
@@ -51,80 +35,7 @@ public class AliPayController {
     @ApiOperation("支付通知")
     @PostMapping("/trade/notify")
     public String tradeNotify(@RequestParam Map<String, String> params){
-
-        log.info("支付通知正在执行");
-        log.info("通知参数 ===> {}", params);
-
-        String result = "failure";
-
-        try {
-            //异步通知验签
-            boolean signVerified = AlipaySignature.rsaCheckV1(
-                    params,
-                    config.getProperty("alipay.alipay-public-key"),
-                    AlipayConstants.CHARSET_UTF8,
-                    AlipayConstants.SIGN_TYPE_RSA2); //调用SDK验证签名
-
-            if(!signVerified){
-                //验签失败则记录异常日志，并在response中返回failure.
-                log.error("支付成功异步通知验签失败！");
-                return result;
-            }
-
-            // 验签成功后
-            log.info("支付成功异步通知验签成功！");
-
-            //按照支付结果异步通知中的描述，对支付结果中的业务内容进行二次校验，
-            //1 商户需要验证该通知数据中的 out_trade_no 是否为商户系统中创建的订单号
-            String outTradeNo = params.get("out_trade_no");
-            OrderInfo order = orderInfoService.getOrderByOrderNo(outTradeNo);
-            if(order == null){
-                log.error("订单不存在");
-                return result;
-            }
-
-            //2 判断 total_amount 是否确实为该订单的实际金额（即商户订单创建时的金额）
-            String totalAmount = params.get("total_amount");
-            int totalAmountInt = new BigDecimal(totalAmount).multiply(new BigDecimal("100")).intValue();
-            int totalFeeInt = order.getTotalFee().intValue();
-            if(totalAmountInt != totalFeeInt){
-                log.error("金额校验失败");
-                return result;
-            }
-
-            //3 校验通知中的 seller_id（或者 seller_email) 是否为 out_trade_no 这笔单据的对应的操作方
-            String sellerId = params.get("seller_id");
-            String sellerIdProperty = config.getProperty("alipay.seller-id");
-            if(!sellerId.equals(sellerIdProperty)){
-                log.error("商家pid校验失败");
-                return result;
-            }
-
-            //4 验证 app_id 是否为该商户本身
-            String appId = params.get("app_id");
-            String appIdProperty = config.getProperty("alipay.app-id");
-            if(!appId.equals(appIdProperty)){
-                log.error("appid校验失败");
-                return result;
-            }
-
-            //在支付宝的业务通知中，只有交易通知状态为 TRADE_SUCCESS时，
-            // 支付宝才会认定为买家付款成功。
-            String tradeStatus = params.get("trade_status");
-            if(!"TRADE_SUCCESS".equals(tradeStatus)){
-                log.error("支付未成功");
-                return result;
-            }
-
-            //处理业务 修改订单状态 记录支付日志
-            aliPayService.processOrder(params);
-
-            //校验成功后在response中返回success并继续商户自身业务处理，校验失败返回failure
-            result = "success";
-        } catch (AlipayApiException e) {
-            e.printStackTrace();
-        }
-        return result;
+        return aliPayService.tradeNotify(params);
     }
 
     /**
@@ -135,7 +46,6 @@ public class AliPayController {
     @ApiOperation("用户取消订单")
     @PostMapping("/trade/close/{orderNo}")
     public Response<String> cancel(@PathVariable String orderNo){
-
         log.info("取消订单");
         aliPayService.cancelOrder(orderNo);
         return Response.success("订单已取消");
@@ -149,9 +59,7 @@ public class AliPayController {
     @ApiOperation("查询订单：测试订单状态用")
     @GetMapping("/trade/query/{orderNo}")
     public Response<String> queryOrder(@PathVariable String orderNo)  {
-
         log.info("查询订单");
-
         String result = aliPayService.queryOrder(orderNo);
         return Response.success(result);
 
@@ -166,7 +74,6 @@ public class AliPayController {
     @ApiOperation("申请退款")
     @PostMapping("/trade/refund/{orderNo}/{reason}")
     public Response<String> refunds(@PathVariable String orderNo, @PathVariable String reason){
-
         log.info("申请退款");
         aliPayService.refund(orderNo, reason);
         return Response.success();
@@ -180,10 +87,8 @@ public class AliPayController {
      */
     @ApiOperation("查询退款：测试用")
     @GetMapping("/trade/fastpay/refund/{orderNo}")
-    public Response<String> queryRefund(@PathVariable String orderNo) throws Exception {
-
+    public Response<String> queryRefund(@PathVariable String orderNo) {
         log.info("查询退款");
-
         String result = aliPayService.queryRefund(orderNo);
         return Response.success(result);
     }