From 85debaa2cfc659e8cea078ee3816ac9b90e2b039 Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Thu, 13 Apr 2023 22:26:28 +0800
Subject: [PATCH] =?UTF-8?q?worker=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5:=20alipay=5Faccount(=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7),alipay=5Fname(=E6=94=AF=E4=BB=98=E5=AE=9D?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/worker/domain/Worker.java    | 12 +++-
 .../resources/mapper/worker/WorkerMapper.xml  | 56 +++++++++++--------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
index 61c3489d..cd9ca5dd 100644
--- a/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
+++ b/ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
@@ -3,6 +3,7 @@ package com.ghy.worker.domain;
 import com.ghy.common.annotation.Excel;
 import com.ghy.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
@@ -11,6 +12,7 @@ import java.util.List;
  * 师傅实体
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class Worker extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -36,6 +38,12 @@ public class Worker extends BaseEntity {
     @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING)
     private String openId;
 
+    @Excel(name = "支付宝账号")
+    private String alipayAccount;
+
+    @Excel(name = "支付宝姓名")
+    private String alipayName;
+
     @Excel(name = "分公司名称", cellType = Excel.ColumnType.STRING)
     private String deptName;
 
@@ -59,7 +67,9 @@ public class Worker extends BaseEntity {
 
     private String bannerUrl;
 
-    // 注册验证码
+    /**
+     * 注册验证码
+     */
     private String registerCode;
 
     private List<Long> workerIds;
diff --git a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
index 98666134..ac45bde8 100644
--- a/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
+++ b/ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
@@ -2,33 +2,37 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ghy.worker.mapper.WorkerMapper">
 
-    <resultMap id="WorkerResult" type="com.ghy.worker.domain.Worker">
-        <result property="workerId"          column="worker_id"     />
-        <result property="name"                column="name"     />
-        <result property="account"             column="account"     />
-        <result property="phone"               column="phone"     />
-        <result property="openId"              column="open_id"     />
-        <result property="password"              column="password"     />
-        <result property="status"              column="status"     />
-        <result property="type"              column="type"     />
-        <result property="deptName"             column="dept_name"/>
-        <result property="deptId"             column="dept_id"/>
-        <result property="workerLogoUrl"     column="worker_logo_url"     />
-        <result property="leaderTeamRate"     column="leader_team_rate"     />
-        <result property="leaderTeamMoney"     column="leader_team_money"     />
-        <result property="createBy"            column="create_by"     />
-        <result property="createTime"          column="create_time"   />
-        <result property="updateBy"            column="update_by"     />
-        <result property="updateTime"          column="update_time"   />
-        <result property="remark"              column="remark"        />
-        <result property="bannerUrl"           column="banner_url"></result>
-        <result property="storeStatus"              column="store_status"        />
+    <resultMap id="WorkerResult"                        type="com.ghy.worker.domain.Worker">
+        <result property="workerId"                     column="worker_id"/>
+        <result property="name"                         column="name"/>
+        <result property="account"                      column="account"/>
+        <result property="phone"                        column="phone"/>
+        <result property="openId"                       column="open_id"/>
+        <result property="alipayAccount"                column="alipay_account"/>
+        <result property="alipayName"                   column="alipay_name"/>
+        <result property="password"                     column="password"/>
+        <result property="status"                       column="status"/>
+        <result property="type"                         column="type"/>
+        <result property="deptName"                     column="dept_name"/>
+        <result property="deptId"                       column="dept_id"/>
+        <result property="workerLogoUrl"                column="worker_logo_url"/>
+        <result property="leaderTeamRate"               column="leader_team_rate"/>
+        <result property="leaderTeamMoney"              column="leader_team_money"/>
+        <result property="createBy"                     column="create_by"/>
+        <result property="createTime"                   column="create_time"   />
+        <result property="updateBy"                     column="update_by"/>
+        <result property="updateTime"                   column="update_time"/>
+        <result property="remark"                       column="remark"/>
+        <result property="bannerUrl"                    column="banner_url"/>
+        <result property="storeStatus"                  column="store_status"/>
     </resultMap>
 
     <sql id="selectWorker">
         SELECT
-            w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, sd.dept_name, sdc.banner_url, w.status, w.worker_logo_url,
-            w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time, w.remark, w.type, w.store_status
+            w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.dept_id, w.status, w.worker_logo_url,
+            w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time,
+            w.remark, w.type, w.store_status, w.alipay_account, w.alipay_name,
+            sd.dept_name, sdc.banner_url
         FROM worker w
         LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id
         LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id
@@ -100,6 +104,8 @@
         <if test="phone != null and phone != ''">phone,</if>
         <if test="password != null and password != ''">password,</if>
         <if test="openId != null and openId != ''">open_id,</if>
+        <if test="alipayAccount != null and alipayAccount != ''">alipay_account,</if>
+        <if test="alipayName != null and alipayName != ''">alipay_name,</if>
         <if test="deptId != null and deptId != ''">dept_id,</if>
         <if test="status != null and status != ''">status,</if>
         <if test="workerLogoUrl != null and workerLogoUrl != ''">worker_logo_url,</if>
@@ -113,6 +119,8 @@
         <if test="password != null and password != ''">#{password},</if>
         <if test="openId != null and openId != ''">#{openId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
+        <if test="alipayAccount != null and alipayAccount != ''">#{alipayAccount},</if>
+        <if test="alipayName != null and alipayName != ''">#{alipayName},</if>
         <if test="status != null and status != ''">#{status},</if>
         <if test="workerLogoUrl != null and workerLogoUrl != ''">#{workerLogoUrl},</if>
         <if test="remark != null and remark != ''">#{remark},</if>
@@ -133,6 +141,8 @@
             <if test="name != null and name != ''"> name = #{name},</if>
             <if test="leaderTeamRate != null and leaderTeamRate != ''"> leader_team_rate = #{leaderTeamRate},</if>
             <if test="leaderTeamMoney != null and leaderTeamMoney != ''"> leader_team_money = #{leaderTeamMoney},</if>
+            <if test="alipayAccount != null and alipayAccount != ''">alipay_account = #{alipayAccount},</if>
+            <if test="alipayName != null and alipayName != ''">alipay_name = #{alipayName},</if>
         </set>
         where worker_id = #{workerId}
     </update>