From 1a916fc0feecffee73a3a78a003ec6459270444a Mon Sep 17 00:00:00 2001
From: qyhdd <q1049270714@163.com>
Date: Mon, 28 Aug 2023 13:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=8F=B8=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E5=AD=97=E6=AE=B5=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java        | 2 +-
 .../src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java | 3 +++
 .../src/main/resources/mapper/business/AliPayOrderMapper.xml   | 2 +-
 .../resources/mapper/business/AliPaySigningOrderMapper.xml     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java
index 2871ce5..6c5861c 100644
--- a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java
+++ b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java
@@ -39,5 +39,5 @@ public class AliPayOrderVo {
 
     private String tradeNo;  //支付宝交易号。支付宝交易凭证号。
 
-
+    private String aliAccountName; //账户名称（公司拼音首字母+编号）
 }
diff --git a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java
index b6fd046..3b4b605 100644
--- a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java
+++ b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java
@@ -39,4 +39,7 @@ public class AliPaySigningOrderVo {
     private String linkName;
 
     private LocalDateTime nextPayTime; //下次续费时间
+
+    private String aliAccountName; //账户名称（公司拼音首字母+编号）
+
 }
diff --git a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml
index cf0903d..dc7b3ae 100644
--- a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml
+++ b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.cyjd.rights.business.mapper.AliPayOrderMapper">
     <select id="getPageOrder" resultType="com.cyjd.rights.vo.AliPayOrderVo">
         select
-        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,trade_no
+        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,trade_no,ali_account_name
         from tb_ali_pay_order
         <where>
             1=1
diff --git a/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml b/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml
index f67873b..ebd1c5c 100644
--- a/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml
+++ b/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.cyjd.rights.business.mapper.AliPaySigningOrderMapper">
     <select id="getPageOrder" resultType="com.cyjd.rights.vo.AliPaySigningOrderVo">
         select
-        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,next_pay_time
+        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,next_pay_time,ali_account_name
         from tb_ali_pay_signing_order
         <where>
             1=1