From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java index 4bcfc7a..4c58e8e 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java +++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java @@ -1,6 +1,8 @@ package com.matrix.system.app.mapper; +import com.matrix.system.app.dto.ModifyUserDto; import com.matrix.system.app.vo.BeauticianVo; +import com.matrix.system.app.vo.UserInfoDetailVo; import com.matrix.system.common.bean.SysUsers; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -18,8 +20,34 @@ @Mapping(source = "suId", target = "id") @Mapping(source = "suName", target = "name") + @Mapping(source = "suPhoto", target = "photo") + @Mapping(source = "suTel", target = "telphone") public abstract BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers); public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list); + @Mapping(source = "suPhoto", target = "photo") + @Mapping(source = "suName", target = "name") + @Mapping(source = "suAliases", target = "engName") + @Mapping(source = "suTel", target = "telphone") + @Mapping(source = "suSex", target = "sex") + @Mapping(source = "suBirthday", target = "birthday") + @Mapping(source = "suEmail", target = "email") + @Mapping(source = "serviceSignature", target = "serviceSign") + @Mapping(source = "suAddress", target = "address") + public abstract UserInfoDetailVo usersToDetailInfoVo(SysUsers sysUsers); + + public abstract ModifyUserDto usersToModifyUserDto(SysUsers sysUsers); + + @Mapping(target = "suPhoto", source = "photo") + @Mapping(target = "suName", source = "name") + @Mapping(target = "suAliases", source = "engName") + @Mapping(target = "suTel", source = "telphone") + @Mapping(target = "suSex", source = "sex") + @Mapping(target = "suBirthday", source = "birthday") + @Mapping(target = "suEmail", source = "email") + @Mapping(target = "serviceSignature", source = "serviceSign") + @Mapping(target = "suAddress", source = "address") + public abstract SysUsers modifyUserDtoToUsers(ModifyUserDto modifyUserDto); + } -- Gitblit v1.9.1