diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 000fa977..f6d5afb3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -30,6 +30,7 @@ import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.standards.memberinfo.service.IMemberInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -88,6 +89,9 @@ public class PayContactsManagementController extends JeroController baseInfo() { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); + queryPayContactsManagement.eq(PayContactsManagement::getUsername,sysUser.getUsername()); + PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement); + + Map baseInfo = memberInfoService.baseInfo(contacts); + + return Result.OK(baseInfo); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index 15f0273b..c488bfcf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -120,7 +120,11 @@ public class PayPaymentCheckController extends JeroController0){ + return Result.OK(list.get(0)); + }else{ + return Result.OK("无数据"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/entity/SysUser.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/entity/SysUser.java new file mode 100644 index 00000000..d36fc15f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/entity/SysUser.java @@ -0,0 +1,140 @@ +package com.jero.standards.memberinfo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * 用户表 + *

+ * + * @Author scott + * @since 2018-12-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +public class SysUser implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ID_WORKER_STR) + private String id; + + /** + * 用户名 + */ + @Excel(name = "用户名", width = 15) + @ApiModelProperty(value = "用户名") + private String username; + + /** + * 姓名 + */ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String realname; + + /** + * 单位全称 + */ + @Excel(name = "单位全称", width = 15) + @ApiModelProperty(value = "单位全称") + private String companyName; + + /** + * 密码 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @ApiModelProperty(value = "密码") + private String password; + + /** + * 邮箱 + */ + @Excel(name = "E-mail", width = 15) + @ApiModelProperty(value = "电子邮箱") + private String email; + + /** + * 确认密码 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @ApiModelProperty(value = "确认密码") + @TableField(exist = false) + private String verifyPassword; + + /** + * md5密码盐 + */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @ApiModelProperty(value = "md5密码盐") + private String salt; + + + /** + * 手机号 + */ + @Excel(name = "手机号", width = 15) + @ApiModelProperty(value = "手机号") + private String phone; + + + /** + * 删除状态（0，正常，1已删除 用户注册之后审核之前的状态为1） + */ + @Excel(name = "删除状态", width = 15,dicCode="del_flag") + // @TableLogic + @ApiModelProperty(value = "删除状态") + private Integer delFlag; + + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 角色 + */ + @ApiModelProperty(value = "角色") + @TableField(exist = false) + private String roleName; + + /**通讯地址*/ + @ApiModelProperty(value = "通讯地址") + @TableField(exist = false) + private String address; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java index 6944712e..d4186eea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/MemberInfoMapper.java @@ -3,6 +3,7 @@ package com.jero.standards.memberinfo.mapper; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.standards.memberinfo.entity.SysUser; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.jero.standards.memberinfo.entity.MemberInfo; @@ -18,4 +19,9 @@ import java.util.List; public interface MemberInfoMapper extends BaseMapper { Integer countByCompanyName(@Param("companyName")String companyName); + /** + * 得到标协管理者信息 + * @return + */ + SysUser getBXGLZ(); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/xml/MemberInfoMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/xml/MemberInfoMapper.xml index 4df7d784..b9dd739c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/xml/MemberInfoMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/mapper/xml/MemberInfoMapper.xml @@ -8,4 +8,12 @@ where tmi.member_type is not null and (su.realname = #{companyName} or su.company_name = #{companyName}) + + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java index 949df9ad..ae5e5e5f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/IMemberInfoService.java @@ -1,8 +1,11 @@ package com.jero.standards.memberinfo.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.company.entity.PayContactsManagement; import com.jero.standards.memberinfo.entity.MemberInfo; +import java.util.Map; + /** * @Description: 会员信息表 * @Author: jeecg-boot @@ -12,4 +15,11 @@ import com.jero.standards.memberinfo.entity.MemberInfo; public interface IMemberInfoService extends IService { int check(String companyName); + + /** + * 查询会员信息 + * @param contacts + * @return + */ + Map baseInfo(PayContactsManagement contacts); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java index 3c6a2439..b1a2d1b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/memberinfo/service/impl/MemberInfoServiceImpl.java @@ -3,13 +3,24 @@ package com.jero.standards.memberinfo.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; +import com.jero.company.entity.PayContactsManagement; +import com.jero.member.entity.PayMemberProject; import com.jero.standards.memberinfo.entity.MemberInfo; +import com.jero.standards.memberinfo.entity.SysUser; import com.jero.standards.memberinfo.mapper.MemberInfoMapper; import com.jero.standards.memberinfo.service.IMemberInfoService; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + /** * @Description: 会员信息表 * @Author: jeecg-boot @@ -20,9 +31,38 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) @DS(value = "multi-datasource1") public class MemberInfoServiceImpl extends ServiceImpl implements IMemberInfoService { - + @Resource + MemberInfoMapper memberInfoMapper; @Override public int check(String companyName) { return baseMapper.countByCompanyName(companyName); } + + /** + * 查询会员信息 + * @param contacts + * @return + */ + @Override + public Map baseInfo(PayContactsManagement contacts) { + + //右侧本企业信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MemberInfo::getId,contacts.getMemberId()); + MemberInfo memberInfo = memberInfoMapper.selectOne(wrapper); + + //左侧秘书处信息 + SysUser secretariat = memberInfoMapper.getBXGLZ(); + //解密 + String phone = PasswordUtil.decrypt(secretariat.getPhone(), PasswordUtil.ALGORITHM, PasswordUtil.Salt); + secretariat.setPhone(phone); + String email = PasswordUtil.decrypt(secretariat.getEmail(), PasswordUtil.ALGORITHM, PasswordUtil.Salt); + secretariat.setEmail(email); + + Map map = new HashMap<>(); + map.put("memberInfo",memberInfo); + map.put("secretariat",secretariat); + + return map; + } }