feat(新增): 保存支付信息

Signed-off-by: bunny <1319900154@qq.com>
2024-03-29 12:49:08 +08:00 · 2024-03-29 12:49:08 +08:00 · 5b9ef88d53
parent 90d6f3200d
commit 5b9ef88d53
22 changed files with 267 additions and 18 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -10,6 +10,7 @@
        <module name="common-util" />
        <module name="service-product-client" />
        <module name="common-service" />
+        <module name="service-order-client" />
        <module name="service-user-client" />
        <module name="common-log" />
        <module name="service-order" />
@ -36,6 +37,7 @@
      <module name="service-cart" options="-parameters" />
      <module name="service-cart-client" options="-parameters" />
      <module name="service-order" options="-parameters" />
+      <module name="service-order-client" options="-parameters" />
      <module name="service-pay" options="-parameters" />
      <module name="service-product" options="-parameters" />
      <module name="service-product-client" options="-parameters" />
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@ -11,6 +11,7 @@
    <file url="file://$PROJECT_DIR$/spzx-model/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/spzx-server-gateway/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/spzx-service-client/service-cart-client/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/spzx-service-client/service-order-client/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/spzx-service-client/service-product-client/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/spzx-service-client/service-user-client/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/spzx-service-client/src/main/java" charset="UTF-8" />
--- a/spzx-service-client/pom.xml
+++ b/spzx-service-client/pom.xml
@ -16,6 +16,7 @@
        <module>service-product-client</module>
        <module>service-user-client</module>
        <module>service-cart-client</module>
+        <module>service-order-client</module>
    </modules>

    <properties>
--- a/spzx-service-client/service-order-client/pom.xml
+++ b/spzx-service-client/service-order-client/pom.xml
@ -0,0 +1,23 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.atguigu</groupId>
+        <artifactId>spzx-service-client</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>service-order-client</artifactId>
+    <packaging>jar</packaging>
+
+    <name>service-order-client</name>
+    <url>https://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+
+    </dependencies>
+</project>
--- a/spzx-service-client/service-order-client/src/main/java/com/atguigu/feign/order/OrderFeignClient.java
+++ b/spzx-service-client/service-order-client/src/main/java/com/atguigu/feign/order/OrderFeignClient.java
@ -0,0 +1,13 @@
+package com.atguigu.feign.order;
+
+import com.atguigu.spzx.model.entity.order.OrderInfo;
+import com.atguigu.spzx.model.vo.result.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(value = "service-order", path = "/api/order/orderInfo")
+public interface OrderFeignClient {
+    @GetMapping("/auth/getOrderInfoByOrderNo/{orderNo}")
+    Result<OrderInfo> getOrderInfoByOrderNo(@PathVariable String orderNo);
+}
--- a/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java
+++ b/spzx-service/service-order/src/main/java/com/atguigu/order/OrderApplication.java
@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;

@SpringBootApplication
-@EnableFeignClients(basePackages = {"com.atguigu.feign.cart", "com.atguigu.feign.user"})
+@EnableFeignClients(basePackages = {"com.atguigu.feign"})
@EnableUserTokenFeignInterceptor
@Slf4j
 public class OrderApplication {
--- a/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java
+++ b/spzx-service/service-order/src/main/java/com/atguigu/order/controller/OrderInfoController.java
@ -5,6 +5,7 @@ import com.atguigu.spzx.model.dto.h5.OrderInfoDto;
 import com.atguigu.spzx.model.entity.order.OrderInfo;
 import com.atguigu.spzx.model.vo.h5.TradeVo;
 import com.atguigu.spzx.model.vo.result.Result;
+import com.atguigu.spzx.model.vo.result.ResultCodeEnum;
 import com.github.pagehelper.PageInfo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@ -59,4 +60,11 @@ public class OrderInfoController {
        PageInfo<OrderInfo> pageInfo = orderInfoService.findUserPage(page, limit, orderStatus);
        return Result.success(pageInfo);
    }
+
+    @Operation(summary = "获取订单信息")
+    @GetMapping("auth/getOrderInfoByOrderNo/{orderNo}")
+    public Result<OrderInfo> getOrderInfoByOrderNo(@Parameter(name = "orderId", description = "订单id", required = true) @PathVariable String orderNo) {
+        OrderInfo orderInfo = orderInfoService.getByOrderNo(orderNo);
+        return Result.build(orderInfo, ResultCodeEnum.SUCCESS);
+    }
 }
--- a/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java
+++ b/spzx-service/service-order/src/main/java/com/atguigu/order/mapper/OrderInfoMapper.java
@ -23,4 +23,12 @@ public interface OrderInfoMapper {
    OrderInfo getById(Long orderId);

    List<OrderInfo> findUserPage(Long userId, Integer orderStatus);
+
+    /**
+     * 获取订单信息
+     *
+     * @param orderNo 订单编号
+     * @return 订单信息
+     */
+    OrderInfo getOrderInfoByOrderNo(String orderNo);
 }
--- a/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java
+++ b/spzx-service/service-order/src/main/java/com/atguigu/order/service/OrderInfoService.java
@ -46,4 +46,12 @@ public interface OrderInfoService {
     * @return PageInfo<OrderInfo>
     */
    PageInfo<OrderInfo> findUserPage(Integer page, Integer limit, Integer orderStatus);
+
+    /**
+     * 获取订单信息
+     *
+     * @param orderNo 订单好
+     * @return OrderInfo
+     */
+    OrderInfo getByOrderNo(String orderNo);
 }
--- a/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java
+++ b/spzx-service/service-order/src/main/java/com/atguigu/order/service/impl/OrderInfoServiceImpl.java
@ -211,4 +211,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {

        return new PageInfo<>(orderInfoList);
    }
+
+    /**
+     * 获取订单信息
+     *
+     * @param orderNo 订单好
+     * @return OrderInfo
+     */
+    @Override
+    public OrderInfo getByOrderNo(String orderNo) {
+        OrderInfo orderInfo = orderInfoMapper.getOrderInfoByOrderNo(orderNo);
+        List<OrderItem> orderItemList = orderItemMapper.findByOrderId(orderInfo.getId());
+        orderInfo.setOrderItemList(orderItemList);
+        return orderInfo;
+    }
 }
--- a/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/spzx-service/service-order/src/main/resources/mapper/OrderInfoMapper.xml
@ -81,4 +81,12 @@
        </where>
        order by id desc
    </select>
+
+    <!-- 获取订单信息 -->
+    <select id="getOrderInfoByOrderNo" resultType="com.atguigu.spzx.model.entity.order.OrderInfo">
+        select
+        <include refid="columns"/>
+        from order_info
+        where order_no = #{orderNo};
+    </select>
 </mapper>
--- a/spzx-service/service-pay/pom.xml
+++ b/spzx-service/service-pay/pom.xml
@ -22,5 +22,11 @@
            <groupId>com.alipay.sdk</groupId>
            <artifactId>alipay-sdk-java</artifactId>
        </dependency>
+
+        <dependency>
+            <groupId>com.atguigu</groupId>
+            <artifactId>service-order-client</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
    </dependencies>
 </project>
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/PayApplication.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/PayApplication.java
@ -5,9 +5,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.openfeign.EnableFeignClients;

@SpringBootApplication
@EnableConfigurationProperties(value = {AlipayProperties.class})
+@EnableFeignClients(basePackages = {"com.atguigu.feign"})
@Slf4j
 public class PayApplication {
    public static void main(String[] args) {
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/mapper/PaymentInfoMapper.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/mapper/PaymentInfoMapper.java
@ -1,7 +1,22 @@
 package com.atguigu.pay.mapper;

+import com.atguigu.spzx.model.entity.pay.PaymentInfo;
 import org.apache.ibatis.annotations.Mapper;

@Mapper
 public interface PaymentInfoMapper {
+    /**
+     * 根据订单编号查询支付记录
+     *
+     * @param orderNo orderNo
+     * @return PaymentInfo
+     */
+    PaymentInfo getByOrderNo(String orderNo);
+
+    /**
+     * 提阿加
+     *
+     * @param paymentInfo paymentInfo
+     */
+    void save(PaymentInfo paymentInfo);
 }
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/AlipayService.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/AlipayService.java
@ -1,5 +1,7 @@
 package com.atguigu.pay.service;

+import com.alipay.api.AlipayApiException;
+
 public interface AlipayService {
    /**
     * 提交支付
@ -7,5 +9,5 @@ public interface AlipayService {
     * @param orderNo 订单提交
     * @return 支付表单
     */
-    String submitAlipay(String orderNo);
+    String submitAlipay(String orderNo) throws AlipayApiException;
 }
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/PaymentInfoService.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/PaymentInfoService.java
@ -1,4 +1,13 @@
 package com.atguigu.pay.service;

+import com.atguigu.spzx.model.entity.pay.PaymentInfo;
+
 public interface PaymentInfoService {
+    /**
+     * 保存支付记录
+     *
+     * @param orderNo 提交订单
+     * @return 支付信息
+     */
+    PaymentInfo savePaymentInfo(String orderNo);
 }
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/impl/AlipayServiceImpl.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/impl/AlipayServiceImpl.java
@ -1,13 +1,23 @@
 package com.atguigu.pay.service.impl;

+import com.alibaba.fastjson.JSON;
+import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
+import com.alipay.api.request.AlipayTradeWapPayRequest;
+import com.alipay.api.response.AlipayTradeWapPayResponse;
+import com.atguigu.exception.BunnyException;
 import com.atguigu.pay.properties.AlipayProperties;
 import com.atguigu.pay.service.AlipayService;
 import com.atguigu.pay.service.PaymentInfoService;
+import com.atguigu.spzx.model.entity.pay.PaymentInfo;
+import com.atguigu.spzx.model.vo.result.ResultCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import java.math.BigDecimal;
+import java.util.HashMap;
+
@Service
@Slf4j
 public class AlipayServiceImpl implements AlipayService {
@ -27,7 +37,35 @@ public class AlipayServiceImpl implements AlipayService {
     * @return 支付表单
     */
    @Override
-    public String submitAlipay(String orderNo) {
-        return null;
+    public String submitAlipay(String orderNo) throws AlipayApiException {
+        // 保存支付记录
+        PaymentInfo paymentInfo = paymentInfoService.savePaymentInfo(orderNo);
+
+        // 创建API对应的request
+        AlipayTradeWapPayRequest alipayRequest = new AlipayTradeWapPayRequest();
+
+        // 同步回调
+        alipayRequest.setReturnUrl(alipayProperties.getReturnPaymentUrl());
+
+        // 异步回调
+        alipayRequest.setNotifyUrl(alipayProperties.getNotifyPaymentUrl());
+        // 准备请求参数 ，声明一个map 集合
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("out_trade_no", paymentInfo.getOrderNo());
+        map.put("product_code", "QUICK_WAP_WAY");
+        // map.put("total_amount",paymentInfo.getAmount());
+        map.put("total_amount", new BigDecimal("0.01"));
+        map.put("subject", paymentInfo.getContent());
+        alipayRequest.setBizContent(JSON.toJSONString(map));
+
+        // 发送请求
+        AlipayTradeWapPayResponse response = alipayClient.pageExecute(alipayRequest);
+        if (response.isSuccess()) {
+            log.info("调用成功");
+            return response.getBody();
+        } else {
+            log.info("调用失败");
+            throw new BunnyException(ResultCodeEnum.DATA_ERROR);
+        }
    }
 }
--- a/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/impl/PaymentInfoServiceImpl.java
+++ b/spzx-service/service-pay/src/main/java/com/atguigu/pay/service/impl/PaymentInfoServiceImpl.java
@ -1,8 +1,49 @@
 package com.atguigu.pay.service.impl;

+import com.atguigu.feign.order.OrderFeignClient;
+import com.atguigu.pay.mapper.PaymentInfoMapper;
 import com.atguigu.pay.service.PaymentInfoService;
+import com.atguigu.spzx.model.entity.order.OrderInfo;
+import com.atguigu.spzx.model.entity.order.OrderItem;
+import com.atguigu.spzx.model.entity.pay.PaymentInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@Service
 public class PaymentInfoServiceImpl implements PaymentInfoService {
+    @Autowired
+    private PaymentInfoMapper paymentInfoMapper;
+    @Autowired
+    private OrderFeignClient orderFeignClient;
+
+    /**
+     * 保存支付记录
+     *
+     * @param orderNo 提交订单
+     * @return 支付信息
+     */
+    @Override
+    public PaymentInfo savePaymentInfo(String orderNo) {
+        // 根据订单编号查询支付记录
+        PaymentInfo paymentInfo = paymentInfoMapper.getByOrderNo(orderNo);
+        // 判断支付记录是否存在
+        if (paymentInfo == null) {
+            // 远程调用获取订单信息
+            OrderInfo orderInfo = orderFeignClient.getOrderInfoByOrderNo(orderNo).getData();
+            paymentInfo = new PaymentInfo();
+            paymentInfo.setUserId(orderInfo.getUserId());
+            paymentInfo.setPayType(orderInfo.getPayType());
+            StringBuilder content = new StringBuilder();
+            for (OrderItem item : orderInfo.getOrderItemList()) {
+                content.append(item.getSkuName()).append(" ");
+            }
+            paymentInfo.setContent(content.toString());
+            paymentInfo.setAmount(orderInfo.getTotalAmount());
+            paymentInfo.setOrderNo(orderNo);
+            paymentInfo.setPaymentStatus(0);
+            // 添加
+            paymentInfoMapper.save(paymentInfo);
+        }
+        return paymentInfo;
+    }
 }
--- a/spzx-service/service-pay/src/main/resources/application-alipay.yml
+++ b/spzx-service/service-pay/src/main/resources/application-alipay.yml
@ -0,0 +1,7 @@
+alipay:
+  alipay_url: https://openapi.alipaydev.com/gateway.do
+  app_id: 2021000122609658
+  app_private_key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXHXwKl51d5htttzJDQg1Oq+w/RAdjdGlTgGlodWxM5Vszd9IgnEffB2HlsGcpgHDteppONr8rWsEy/LmwaMR9C83YfgFPRbSIYATrQw1VynuwEFwvlW5FBT00QUqmL1AXaFGWLAao8xjRjQiArhnQA+o88DXEVnUwHTWFd8aOymesOUjJGWOId6x1MnK8om66Zxc/QFR/vZoQaE8YrATNGMMd1O1CGsnwgJ1bBOcG1Cv1dF903gllGwkLhSE3LK1/SbUg0fUi8mHU0EUyasbknlFqBdvFvJZZJ0NC+Z2sZqXV57DLa8M7bp6+YsDuc0o0EAVnLx7beYlDjwGDMgqxAgMBAAECggEAJo9UfpNviW1VJGrxvW3WXXPLRd2DESK8WZ1TyF7mMrz3x6tUiBO41zVYCrc3q8RljIOTak/X+iUfVXZdn6EsOkhPz2Vfyi2cQoxV1P54IaMYarXSACZeS+hpVLMwbDV4d3CcGPjE/kmB1L7rI4LJfWXyWHhnD+GL56ocZSFKHlcsY2bx99T+HHKTretBRnLQ8q8/iZLkTbxReaMd3o9dGTqS75d3O1nT4u0A8Pupo2dPrlE7NvtOLJMEKixToJPAfJ0b2/H1nxV19/ZW3xvRPJjSIdx32ULuUIyzkAMlH5jwO3D9NMR8fbLcsewgDAif0sPB3USpUT/4AfmJAdcVrQKBgQDf1DnUXQ/JPH/SS78W1EdUzvhGjead1NCG70gZH9YKWS3+l4wkl7l1bqrXGe17jVnPD0vHQZT7V9MjQpa0n9mGU6jKt7ym27BQwF6CLqLE82ITKKqRhUAY7D/TpXPD+DI4STmRqEWDzCgAeX2B9Y7MtOndlExPh8ZxPKtPxDPsNwKBgQCs1cH8h/nGXMv2I0hLPdIKVAQRPDCVBpzuycxn2ezHDcz5rBrYsjOpdNr3SWzcavduGI4A673uWa5znO2KE4e8Y8Uoi75wI7nx4/VapsnS8IuqpIOpkLR2ovEjxGz1BI6QyIg1Xl3QFF65BBVEucgYeLXvt/dMdUA7Z7id/h9cVwKBgDZkZmE69Dkc4JsEGT28/FCZsy/CEAbOzpXb1BN27xa4sTqrLT0/OaxV5mI7RMC/itGMkAet4jxqDT8GUYU3Sy8faWdJ2yhZPrGA7faIyrk9w9mQClMupHLqBmCyVj2LNPkEol7JG4t5s0baPyuztq38UNCt1xWEky61ZZQOw+dlAoGAQdEhD0bEwlpCPZhQBn8jRlWaOun94jJjfreQRJgDiAXkYcu9aXnrHIPogrUOZJ3DXcSyBv2/FU5HlbVT6/nl/cLMqNUWj2O7grb5jyzmvJJnzXLaxK7bWjZQt/ssNt4mYFJNNG2cMgofzDsW0lYhMdh+CCy5Wv9nl3e3IUtNq/8CgYASPcPdaCBLzCSGlTV9HMhQwRhOpWLOzQNKprebQf0fubNFGd6+yfM6DdejHXf6KH4IgV9l8OPe5ro85tmrBkvMlbh7KHbpYJ/V9cdMKd+kbxoJTkRKCnoZhY5QSuEMoC8OB1qhzJeuoqUvmpi0q569IBXrxZguD29ZqwGxoa1KNg==
+  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk41ooyX7utKM9B7jNcc4EzmyVU0Qfs18KFVFwyhl7YQMw/PB2YVQreVSvvb1rS/2YVxcjLK/9ehD//79b8aoxhFlEGqA7fGu0C2UR6pl+PhmRLcHeyN+DOG87Fhqb1t4JXmXQc1LXUfelJoh+r5XnMPWDAlY5JJtH3GZIU+AoBt9PuEtfhh03LL6WtnJMwOnqH94T8qHymLDftEGOWme1iAlenB692cUId20BmLJal621EAN+xpmkeJZEpx1wQ2fGhyTo7pm4v8LVLuqzOXkraffITvfbPl5IU0kjjs/QECwItAI0IBbNsDutezw/a0JobijjoF28uo4gtwmncBoQwIDAQAB
+  return_payment_url: http://192.168.136.142/#/pages/money/paySuccess
+  notify_payment_url: http://127.0.0.1:8500/api/order/alipay/callback/notify
--- a/spzx-service/service-pay/src/main/resources/application-dev.yml
+++ b/spzx-service/service-pay/src/main/resources/application-dev.yml
@ -17,10 +17,10 @@ bunny:
    database: 2
    password: "02120212"

-  alipay:
-    alipay_url: https://openapi.alipaydev.com/gateway.do
-    app_id: 2021000122609658
-    app_private_key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXHXwKl51d5htttzJDQg1Oq+w/RAdjdGlTgGlodWxM5Vszd9IgnEffB2HlsGcpgHDteppONr8rWsEy/LmwaMR9C83YfgFPRbSIYATrQw1VynuwEFwvlW5FBT00QUqmL1AXaFGWLAao8xjRjQiArhnQA+o88DXEVnUwHTWFd8aOymesOUjJGWOId6x1MnK8om66Zxc/QFR/vZoQaE8YrATNGMMd1O1CGsnwgJ1bBOcG1Cv1dF903gllGwkLhSE3LK1/SbUg0fUi8mHU0EUyasbknlFqBdvFvJZZJ0NC+Z2sZqXV57DLa8M7bp6+YsDuc0o0EAVnLx7beYlDjwGDMgqxAgMBAAECggEAJo9UfpNviW1VJGrxvW3WXXPLRd2DESK8WZ1TyF7mMrz3x6tUiBO41zVYCrc3q8RljIOTak/X+iUfVXZdn6EsOkhPz2Vfyi2cQoxV1P54IaMYarXSACZeS+hpVLMwbDV4d3CcGPjE/kmB1L7rI4LJfWXyWHhnD+GL56ocZSFKHlcsY2bx99T+HHKTretBRnLQ8q8/iZLkTbxReaMd3o9dGTqS75d3O1nT4u0A8Pupo2dPrlE7NvtOLJMEKixToJPAfJ0b2/H1nxV19/ZW3xvRPJjSIdx32ULuUIyzkAMlH5jwO3D9NMR8fbLcsewgDAif0sPB3USpUT/4AfmJAdcVrQKBgQDf1DnUXQ/JPH/SS78W1EdUzvhGjead1NCG70gZH9YKWS3+l4wkl7l1bqrXGe17jVnPD0vHQZT7V9MjQpa0n9mGU6jKt7ym27BQwF6CLqLE82ITKKqRhUAY7D/TpXPD+DI4STmRqEWDzCgAeX2B9Y7MtOndlExPh8ZxPKtPxDPsNwKBgQCs1cH8h/nGXMv2I0hLPdIKVAQRPDCVBpzuycxn2ezHDcz5rBrYsjOpdNr3SWzcavduGI4A673uWa5znO2KE4e8Y8Uoi75wI7nx4/VapsnS8IuqpIOpkLR2ovEjxGz1BI6QyIg1Xl3QFF65BBVEucgYeLXvt/dMdUA7Z7id/h9cVwKBgDZkZmE69Dkc4JsEGT28/FCZsy/CEAbOzpXb1BN27xa4sTqrLT0/OaxV5mI7RMC/itGMkAet4jxqDT8GUYU3Sy8faWdJ2yhZPrGA7faIyrk9w9mQClMupHLqBmCyVj2LNPkEol7JG4t5s0baPyuztq38UNCt1xWEky61ZZQOw+dlAoGAQdEhD0bEwlpCPZhQBn8jRlWaOun94jJjfreQRJgDiAXkYcu9aXnrHIPogrUOZJ3DXcSyBv2/FU5HlbVT6/nl/cLMqNUWj2O7grb5jyzmvJJnzXLaxK7bWjZQt/ssNt4mYFJNNG2cMgofzDsW0lYhMdh+CCy5Wv9nl3e3IUtNq/8CgYASPcPdaCBLzCSGlTV9HMhQwRhOpWLOzQNKprebQf0fubNFGd6+yfM6DdejHXf6KH4IgV9l8OPe5ro85tmrBkvMlbh7KHbpYJ/V9cdMKd+kbxoJTkRKCnoZhY5QSuEMoC8OB1qhzJeuoqUvmpi0q569IBXrxZguD29ZqwGxoa1KNg==
-    alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk41ooyX7utKM9B7jNcc4EzmyVU0Qfs18KFVFwyhl7YQMw/PB2YVQreVSvvb1rS/2YVxcjLK/9ehD//79b8aoxhFlEGqA7fGu0C2UR6pl+PhmRLcHeyN+DOG87Fhqb1t4JXmXQc1LXUfelJoh+r5XnMPWDAlY5JJtH3GZIU+AoBt9PuEtfhh03LL6WtnJMwOnqH94T8qHymLDftEGOWme1iAlenB692cUId20BmLJal621EAN+xpmkeJZEpx1wQ2fGhyTo7pm4v8LVLuqzOXkraffITvfbPl5IU0kjjs/QECwItAI0IBbNsDutezw/a0JobijjoF28uo4gtwmncBoQwIDAQAB
-    return_payment_url: http://192.168.136.142/#/pages/money/paySuccess
-    notify_payment_url: http://127.0.0.1:8500/api/order/alipay/callback/notify
+#  alipay:
+#    alipay_url: https://openapi.alipaydev.com/gateway.do
+#    app_id: 2021000122609658
+#    app_private_key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXHXwKl51d5htttzJDQg1Oq+w/RAdjdGlTgGlodWxM5Vszd9IgnEffB2HlsGcpgHDteppONr8rWsEy/LmwaMR9C83YfgFPRbSIYATrQw1VynuwEFwvlW5FBT00QUqmL1AXaFGWLAao8xjRjQiArhnQA+o88DXEVnUwHTWFd8aOymesOUjJGWOId6x1MnK8om66Zxc/QFR/vZoQaE8YrATNGMMd1O1CGsnwgJ1bBOcG1Cv1dF903gllGwkLhSE3LK1/SbUg0fUi8mHU0EUyasbknlFqBdvFvJZZJ0NC+Z2sZqXV57DLa8M7bp6+YsDuc0o0EAVnLx7beYlDjwGDMgqxAgMBAAECggEAJo9UfpNviW1VJGrxvW3WXXPLRd2DESK8WZ1TyF7mMrz3x6tUiBO41zVYCrc3q8RljIOTak/X+iUfVXZdn6EsOkhPz2Vfyi2cQoxV1P54IaMYarXSACZeS+hpVLMwbDV4d3CcGPjE/kmB1L7rI4LJfWXyWHhnD+GL56ocZSFKHlcsY2bx99T+HHKTretBRnLQ8q8/iZLkTbxReaMd3o9dGTqS75d3O1nT4u0A8Pupo2dPrlE7NvtOLJMEKixToJPAfJ0b2/H1nxV19/ZW3xvRPJjSIdx32ULuUIyzkAMlH5jwO3D9NMR8fbLcsewgDAif0sPB3USpUT/4AfmJAdcVrQKBgQDf1DnUXQ/JPH/SS78W1EdUzvhGjead1NCG70gZH9YKWS3+l4wkl7l1bqrXGe17jVnPD0vHQZT7V9MjQpa0n9mGU6jKt7ym27BQwF6CLqLE82ITKKqRhUAY7D/TpXPD+DI4STmRqEWDzCgAeX2B9Y7MtOndlExPh8ZxPKtPxDPsNwKBgQCs1cH8h/nGXMv2I0hLPdIKVAQRPDCVBpzuycxn2ezHDcz5rBrYsjOpdNr3SWzcavduGI4A673uWa5znO2KE4e8Y8Uoi75wI7nx4/VapsnS8IuqpIOpkLR2ovEjxGz1BI6QyIg1Xl3QFF65BBVEucgYeLXvt/dMdUA7Z7id/h9cVwKBgDZkZmE69Dkc4JsEGT28/FCZsy/CEAbOzpXb1BN27xa4sTqrLT0/OaxV5mI7RMC/itGMkAet4jxqDT8GUYU3Sy8faWdJ2yhZPrGA7faIyrk9w9mQClMupHLqBmCyVj2LNPkEol7JG4t5s0baPyuztq38UNCt1xWEky61ZZQOw+dlAoGAQdEhD0bEwlpCPZhQBn8jRlWaOun94jJjfreQRJgDiAXkYcu9aXnrHIPogrUOZJ3DXcSyBv2/FU5HlbVT6/nl/cLMqNUWj2O7grb5jyzmvJJnzXLaxK7bWjZQt/ssNt4mYFJNNG2cMgofzDsW0lYhMdh+CCy5Wv9nl3e3IUtNq/8CgYASPcPdaCBLzCSGlTV9HMhQwRhOpWLOzQNKprebQf0fubNFGd6+yfM6DdejHXf6KH4IgV9l8OPe5ro85tmrBkvMlbh7KHbpYJ/V9cdMKd+kbxoJTkRKCnoZhY5QSuEMoC8OB1qhzJeuoqUvmpi0q569IBXrxZguD29ZqwGxoa1KNg==
+#    alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk41ooyX7utKM9B7jNcc4EzmyVU0Qfs18KFVFwyhl7YQMw/PB2YVQreVSvvb1rS/2YVxcjLK/9ehD//79b8aoxhFlEGqA7fGu0C2UR6pl+PhmRLcHeyN+DOG87Fhqb1t4JXmXQc1LXUfelJoh+r5XnMPWDAlY5JJtH3GZIU+AoBt9PuEtfhh03LL6WtnJMwOnqH94T8qHymLDftEGOWme1iAlenB692cUId20BmLJal621EAN+xpmkeJZEpx1wQ2fGhyTo7pm4v8LVLuqzOXkraffITvfbPl5IU0kjjs/QECwItAI0IBbNsDutezw/a0JobijjoF28uo4gtwmncBoQwIDAQAB
+#    return_payment_url: http://192.168.136.142/#/pages/money/paySuccess
+#    notify_payment_url: http://127.0.0.1:8500/api/order/alipay/callback/notify
--- a/spzx-service/service-pay/src/main/resources/application.yml
+++ b/spzx-service/service-pay/src/main/resources/application.yml
@ -5,6 +5,8 @@ spring:
    active: dev
  application:
    name: service-pay
+  config:
+    import: application-alipay.yml

  cloud:
    sentinel:
@ -48,10 +50,10 @@ logging:
  file:
    path: "logs/${spring.application.name}"

-alipay:
-  alipay_url: ${bunny.alipay.alipay_url}
-  app_id: ${bunny.alipay.app_id}
-  app_private_key: ${bunny.alipay.app_private_key}
-  alipay_public_key: ${bunny.alipay.alipay_public_key}
-  return_payment_url: ${bunny.alipay.return_payment_url}
-  notify_payment_url: ${bunny.alipay.notify_payment_url}
+#alipay:
+#  alipay_url: ${bunny.alipay.alipay_url}
+#  app_id: ${bunny.alipay.app_id}
+#  app_private_key: ${bunny.alipay.app_private_key}
+#  alipay_public_key: ${bunny.alipay.alipay_public_key}
+#  return_payment_url: ${bunny.alipay.return_payment_url}
+#  notify_payment_url: ${bunny.alipay.notify_payment_url}
--- a/spzx-service/service-pay/src/main/resources/mapper/PaymentInfoMapper.xml
+++ b/spzx-service/service-pay/src/main/resources/mapper/PaymentInfoMapper.xml
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.atguigu.pay.mapper.PaymentInfoMapper">
+    <!-- 用于select查询公用抽取的列 -->
+    <sql id="columns">
+        id,user_id,order_no,pay_type,out_trade_no,amount,content,payment_status,callback_time,callback_content,create_time,update_time,is_deleted
+    </sql>
+
+    <!-- 添加 -->
+    <insert id="save">
+        insert into payment_info (id,
+                                  user_id,
+                                  order_no,
+                                  pay_type,
+                                  out_trade_no,
+                                  amount,
+                                  content,
+                                  payment_status,
+                                  callback_time,
+                                  callback_content)
+        values (#{id},
+                #{userId},
+                #{orderNo},
+                #{payType},
+                #{outTradeNo},
+                #{amount},
+                #{content},
+                #{paymentStatus},
+                #{callbackTime},
+                #{callbackContent})
+    </insert>
+
+    <!-- 根据订单编号查询支付记录 -->
+    <select id="getByOrderNo" resultType="com.atguigu.spzx.model.entity.pay.PaymentInfo">
+        select
+        <include refid="columns"/>
+        from payment_info
+        where
+        order_no = #{orderNo}
+    </select>
+</mapper>