clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

worker表增加字段: alipay_account(支付宝账号),alipay_name(支付宝姓名)

This commit is contained in:
HH 2023-04-13 22:26:28 +08:00
parent de68791a44
commit 85debaa2cf
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-worker/src/main/java/com/ghy/worker/domain/Worker.java
View File

@ -3,6 +3,7 @@ package com.ghy.worker.domain;
import com.ghy.common.annotation.Excel; import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity; import com.ghy.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List; import java.util.List;
@ -11,6 +12,7 @@ import java.util.List;
* 师傅实体 * 师傅实体
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class Worker extends BaseEntity { public class Worker extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -36,6 +38,12 @@ public class Worker extends BaseEntity {
@Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING) @Excel(name = "微信open_id", cellType = Excel.ColumnType.STRING)
private String openId; private String openId;
@Excel(name = "支付宝账号")
private String alipayAccount;
@Excel(name = "支付宝姓名")
private String alipayName;
@Excel(name = "分公司名称", cellType = Excel.ColumnType.STRING) @Excel(name = "分公司名称", cellType = Excel.ColumnType.STRING)
private String deptName; private String deptName;
@ -59,7 +67,9 @@ public class Worker extends BaseEntity {
private String bannerUrl; private String bannerUrl;
// 注册验证码 /**
* 注册验证码
*/
private String registerCode; private String registerCode;
private List<Long> workerIds; private List<Long> workerIds;

56
ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml
View File

@ -2,33 +2,37 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.ghy.worker.mapper.WorkerMapper">
<resultMap id="WorkerResult" type="com.ghy.worker.domain.Worker"> <resultMap id="WorkerResult" type="com.ghy.worker.domain.Worker">
<result property="workerId" column="worker_id" /> <result property="workerId" column="worker_id"/>
<result property="name" column="name" /> <result property="name" column="name"/>
<result property="account" column="account" /> <result property="account" column="account"/>
<result property="phone" column="phone" /> <result property="phone" column="phone"/>
<result property="openId" column="open_id" /> <result property="openId" column="open_id"/>
<result property="password" column="password" /> <result property="alipayAccount" column="alipay_account"/>
<result property="status" column="status" /> <result property="alipayName" column="alipay_name"/>
<result property="type" column="type" /> <result property="password" column="password"/>
<result property="deptName" column="dept_name"/> <result property="status" column="status"/>
<result property="deptId" column="dept_id"/> <result property="type" column="type"/>
<result property="workerLogoUrl" column="worker_logo_url" /> <result property="deptName" column="dept_name"/>
<result property="leaderTeamRate" column="leader_team_rate" /> <result property="deptId" column="dept_id"/>
<result property="leaderTeamMoney" column="leader_team_money" /> <result property="workerLogoUrl" column="worker_logo_url"/>
<result property="createBy" column="create_by" /> <result property="leaderTeamRate" column="leader_team_rate"/>
<result property="createTime" column="create_time" /> <result property="leaderTeamMoney" column="leader_team_money"/>
<result property="updateBy" column="update_by" /> <result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time" /> <result property="createTime" column="create_time" />
<result property="remark" column="remark" /> <result property="updateBy" column="update_by"/>
<result property="bannerUrl" column="banner_url"></result> <result property="updateTime" column="update_time"/>
<result property="storeStatus" column="store_status" /> <result property="remark" column="remark"/>
<result property="bannerUrl" column="banner_url"/>
<result property="storeStatus" column="store_status"/>
</resultMap> </resultMap>
<sql id="selectWorker"> <sql id="selectWorker">
SELECT 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.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.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 FROM worker w
LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id 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 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="phone != null and phone != ''">phone,</if>
<if test="password != null and password != ''">password,</if> <if test="password != null and password != ''">password,</if>
<if test="openId != null and openId != ''">open_id,</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="deptId != null and deptId != ''">dept_id,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="workerLogoUrl != null and workerLogoUrl != ''">worker_logo_url,</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="password != null and password != ''">#{password},</if>
<if test="openId != null and openId != ''">#{openId},</if> <if test="openId != null and openId != ''">#{openId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</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="status != null and status != ''">#{status},</if>
<if test="workerLogoUrl != null and workerLogoUrl != ''">#{workerLogoUrl},</if> <if test="workerLogoUrl != null and workerLogoUrl != ''">#{workerLogoUrl},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
@ -133,6 +141,8 @@
<if test="name != null and name != ''"> name = #{name},</if> <if test="name != null and name != ''"> name = #{name},</if>
<if test="leaderTeamRate != null and leaderTeamRate != ''"> leader_team_rate = #{leaderTeamRate},</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="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> </set>
where worker_id = #{workerId} where worker_id = #{workerId}
</update> </update>