From d9c4252c54adc1684de9b56ad810465945e442a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 09 七月 2023 06:20:31 +0800
Subject: [PATCH] 更新支付相关功能及多语言

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index d6f0cac..c3612d6 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -8,9 +8,11 @@
         <result column="account" property="account" />
         <result column="jobNumber" property="jobNumber" />
         <result column="phone" property="phone" />
+        <result column="phoneOperator" property="phoneOperator"/>
         <result column="password" property="password" />
         <result column="withdrawPassword" property="withdrawPassword"/>
-        <result column="name" property="name" />
+        <result column="lastName" property="lastName" />
+        <result column="firstName" property="firstName"/>
         <result column="sex" property="sex" />
         <result column="idCard" property="idCard" />
         <result column="companyId" property="companyId" />
@@ -89,9 +91,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -162,9 +166,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -237,9 +243,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -342,7 +350,9 @@
         a.id as id,
         a.headImgUrl as avatar,
         a.sex as sex,
-        a.`name` as `name`,
+        a.lastName as lastName,
+        a.firstName as firstName,
+        a.phoneOperator as phoneOperator,
         a.phone as phone,
         DATE_FORMAT(a.birthday, '%Y-%m-%d') as birthday,
         a.email,
@@ -395,9 +405,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -469,9 +481,11 @@
         a.id as id,
         a.account as account,
         a.jobNumber as jobNumber,
+        a.phoneOperator as phoneOperator,
         a.phone as phone,
         a.password as password,
-        a.name as name,
+        a.firstName as firstName,
+        a.lastName as lastName,
         a.sex as sex,
         a.idCard as idCard,
         a.companyId as companyId,
@@ -550,9 +564,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -632,9 +648,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -707,9 +725,11 @@
         id as id,
         account as account,
         jobNumber as jobNumber,
+        phoneOperator as phoneOperator,
         phone as phone,
         password as password,
-        name as name,
+        firstName as firstName,
+        lastName as lastName,
         sex as sex,
         idCard as idCard,
         companyId as companyId,
@@ -777,8 +797,9 @@
     <select id="queryMyInviteDriverList" resultType="map">
         select
             id as id,
+            phoneOperator as phoneOperator,
             phone as phone,
-            name as name,
+            CONCAT(firstName, " ", lastName) as name,
             headImgUrl as avatar,
             DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
         from

--
Gitblit v1.7.1