dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
wangh 2023-11-29 17:37:42 +08:00
parent dd5df3bc78
commit 01641bbae2
4 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/MtInvitation.java
View File

@ -18,7 +18,7 @@ public class MtInvitation extends BaseEntity {
/** /**
* 用户id * 用户id
*/ */
private Integer userid; private Integer userId;
/** /**
* 店铺Id * 店铺Id
*/ */
@ -26,11 +26,11 @@ public class MtInvitation extends BaseEntity {
/** /**
* 员工id * 员工id
*/ */
private Integer staffid; private Integer staffId;
/** /**
* 邀请人id * 邀请人id
*/ */
private Integer inviterid; private Integer inviterId;
/** /**
* 状态：启用、禁用 * 状态：启用、禁用
*/ */

77
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/MtInvitationMapper.xml
View File

@ -4,10 +4,11 @@
<resultMap type="com.fuint.business.userManager.entity.MtInvitation" id="MtInvitationMap"> <resultMap type="com.fuint.business.userManager.entity.MtInvitation" id="MtInvitationMap">
<result property="id" column="id" jdbcType="INTEGER"/> <result property="id" column="id" jdbcType="INTEGER"/>
<result property="userid" column="userId" jdbcType="INTEGER"/> <result property="userId" column="userId" jdbcType="INTEGER"/>
<result property="storeId" column="storeId" jdbcType="INTEGER"/> <result property="storeId" column="storeId" jdbcType="INTEGER"/>
<result property="staffid" column="staffId" jdbcType="INTEGER"/> <result property="chainstoreId" column="chain_store_id" jdbcType="INTEGER"/>
<result property="inviterid" column="inviterId" jdbcType="INTEGER"/> <result property="inviterId" column="inviterId" jdbcType="INTEGER"/>
<result property="inviterId" column="inviterId" jdbcType="INTEGER"/>
<result property="status" column="status" jdbcType="VARCHAR"/> <result property="status" column="status" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createBy" column="create_by" jdbcType="VARCHAR"/> <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
@ -18,16 +19,16 @@
<!--查询单个--> <!--查询单个-->
<select id="queryById" resultMap="MtInvitationMap"> <select id="queryById" resultMap="MtInvitationMap">
select select
id, userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by id, userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by
from mt_invitation from mt_invitation
where id = #{id} where id = #{id}
</select> </select>
<!--查询单个--> <!--查询单个-->
<select id="queryByStoreId" resultMap="MtInvitationMap"> <select id="queryBystoreId" resultMap="MtInvitationMap">
select select
id, userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by id, userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by
from mt_invitation from mt_invitation
where storeId = #{storeId} and userId = #{userId} where storeId = #{storeId} and userId = #{userId}
</select> </select>
@ -35,23 +36,23 @@
<!--查询指定行数据--> <!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="MtInvitationMap"> <select id="queryAllByLimit" resultMap="MtInvitationMap">
select select
id, userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by id, userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by
from mt_invitation from mt_invitation
<where> <where>
<if test="id != null"> <if test="id != null">
and id = #{id} and id = #{id}
</if> </if>
<if test="userid != null"> <if test="userId != null">
and userId = #{userid} and userId = #{userId}
</if> </if>
<if test="storeid != null"> <if test="storeId != null">
and storeId = #{storeid} and storeId = #{storeId}
</if> </if>
<if test="staffid != null"> <if test="inviterId != null">
and staffId = #{staffid} and inviterId = #{inviterId}
</if> </if>
<if test="inviterid != null"> <if test="inviterId != null">
and inviterId = #{inviterid} and inviterId = #{inviterId}
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
and status = #{status} and status = #{status}
@ -79,17 +80,17 @@
<if test="id != null"> <if test="id != null">
and id = #{id} and id = #{id}
</if> </if>
<if test="userid != null"> <if test="userId != null">
and userId = #{userid} and userId = #{userId}
</if> </if>
<if test="storeid != null"> <if test="storeId != null">
and storeId = #{storeid} and storeId = #{storeId}
</if> </if>
<if test="staffid != null"> <if test="inviterId != null">
and staffId = #{staffid} and inviterId = #{inviterId}
</if> </if>
<if test="inviterid != null"> <if test="inviterId != null">
and inviterId = #{inviterid} and inviterId = #{inviterId}
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
and status = #{status} and status = #{status}
@ -111,28 +112,28 @@
<!--新增所有列--> <!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true"> <insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into mt_invitation(userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by,chain_store_id) insert into mt_invitation(userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by,chain_store_id)
values (#{userid}, #{storeid}, #{staffid}, #{inviterid}, #{status}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}),#{chainStoreId} values (#{userId}, #{storeId}, #{inviterId}, #{inviterId}, #{status}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy},#{chainStoreId})
</insert> </insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true"> <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_invitation(userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by) insert into mt_invitation(userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by)
values values
<foreach collection="entities" item="entity" separator=","> <foreach collection="entities" item="entity" separator=",">
(#{entity.userid}, #{entity.storeid}, #{entity.staffid}, #{entity.inviterid}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}) (#{entity.userId}, #{entity.storeId}, #{entity.inviterId}, #{entity.inviterId}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy})
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true"> <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into mt_invitation(userId, storeId, staffId, inviterId, status, create_time, create_by, update_time, update_by) insert into mt_invitation(userId, storeId, inviterId, inviterId, status, create_time, create_by, update_time, update_by)
values values
<foreach collection="entities" item="entity" separator=","> <foreach collection="entities" item="entity" separator=",">
(#{entity.userid}, #{entity.storeid}, #{entity.staffid}, #{entity.inviterid}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}) (#{entity.userId}, #{entity.storeId}, #{entity.inviterId}, #{entity.inviterId}, #{entity.status}, #{entity.createTime}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy})
</foreach> </foreach>
on duplicate key update on duplicate key update
userId = values(userId), userId = values(userId),
storeId = values(storeId), storeId = values(storeId),
staffId = values(staffId), inviterId = values(inviterId),
inviterId = values(inviterId), inviterId = values(inviterId),
status = values(status), status = values(status),
create_time = values(create_time), create_time = values(create_time),
@ -145,17 +146,17 @@
<update id="update"> <update id="update">
update mt_invitation update mt_invitation
<set> <set>
<if test="userid != null"> <if test="userId != null">
userId = #{userid}, userId = #{userId},
</if> </if>
<if test="storeid != null"> <if test="storeId != null">
storeId = #{storeid}, storeId = #{storeId},
</if> </if>
<if test="staffid != null"> <if test="inviterId != null">
staffId = #{staffid}, inviterId = #{inviterId},
</if> </if>
<if test="inviterid != null"> <if test="inviterId != null">
inviterId = #{inviterid}, inviterId = #{inviterId},
</if> </if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
status = #{status}, status = #{status},

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -227,7 +227,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
} }
// 添加邀请注册信息 // 添加邀请注册信息
MtInvitation invitation = new MtInvitation(); MtInvitation invitation = new MtInvitation();
invitation.setUserid(ljUser.getId()); invitation.setUserId(ljUser.getId());
invitation.setStoreId(storeId); invitation.setStoreId(storeId);
invitation.setStaffid(nowAccountInfo.getStaffId()); invitation.setStaffid(nowAccountInfo.getStaffId());
invitation.setChainStoreId(chainStoreId); invitation.setChainStoreId(chainStoreId);

4
fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java
View File

@ -832,7 +832,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), user.getId()); MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), user.getId());
if (ObjectUtil.isEmpty(mtInvitation1)) { if (ObjectUtil.isEmpty(mtInvitation1)) {
MtInvitation mtInvitation = new MtInvitation(); MtInvitation mtInvitation = new MtInvitation();
mtInvitation.setUserid(user.getId()); mtInvitation.setUserId(user.getId());
mtInvitation.setStoreId(Integer.parseInt(storeId)); mtInvitation.setStoreId(Integer.parseInt(storeId));
mtInvitation.setStaffid(Integer.parseInt(staffId)); mtInvitation.setStaffid(Integer.parseInt(staffId));
mtInvitation.setInviterid(Integer.parseInt(inviterId)); mtInvitation.setInviterid(Integer.parseInt(inviterId));
@ -857,7 +857,7 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), user.getId()); MtInvitation mtInvitation1 = mtInvitationMapper.queryByStoreId(Integer.parseInt(storeId), user.getId());
if (ObjectUtil.isEmpty(mtInvitation1)) { if (ObjectUtil.isEmpty(mtInvitation1)) {
MtInvitation mtInvitation = new MtInvitation(); MtInvitation mtInvitation = new MtInvitation();
mtInvitation.setUserid(user.getId()); mtInvitation.setUserId(user.getId());
mtInvitation.setStoreId(Integer.parseInt(storeId)); mtInvitation.setStoreId(Integer.parseInt(storeId));
mtInvitation.setStaffid(Integer.parseInt(staffId)); mtInvitation.setStaffid(Integer.parseInt(staffId));
mtInvitation.setInviterid(Integer.parseInt(inviterId)); mtInvitation.setInviterid(Integer.parseInt(inviterId));