From 86dba4c9631c1c7d2f11a2fdd30427eeb5524105 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 27 May 2020 18:04:53 +0800
Subject: [PATCH] 20200527 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinListVo.java | 16 +
src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java | 121 ++++++-----
src/main/java/com/xcong/excoin/modules/member/dao/MemberAuthenticationDao.java | 10 +
src/main/resources/mapper/member/MemberAuthenticationDao.xml | 9
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java | 23 ++
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 168 ++++++++++++++++
src/main/resources/mapper/member/MemberDao.xml | 1
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java | 45 ++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 93 +++++++-
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java | 31 +++
src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java | 31 +-
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 41 ++-
12 files changed, 482 insertions(+), 107 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinListVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinListVo.java
new file mode 100644
index 0000000..f85f3ee
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinListVo.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.coin.parameter.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "OrderWalletCoinListVo", description = "委托单返回")
+public class OrderWalletCoinListVo {
+
+ @ApiModelProperty(value = "委托单")
+ private List<OrderWalletCoinVo> orderWalletCoinVo;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index a5c5fdf..5fc8ceb 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -1,15 +1,78 @@
-package com.xcong.excoin.modules.member.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 用户类
- *
- * @author wzy
- * @date 2020-05-18
- **/
-@RestController
-@RequestMapping(value = "/api/member")
-public class MemberController {
-}
+package com.xcong.excoin.modules.member.controller;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
+import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
+import com.xcong.excoin.modules.member.service.MemberService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 用户类
+ *
+ * @author wzy
+ * @date 2020-05-18
+ **/
+@Slf4j
+@Api(value = "个人中心接口", tags = "个人中心接口")
+@RestController
+@RequestMapping(value = "/api/member")
+public class MemberController {
+
+ @Resource
+ MemberService memberService;
+
+ /**
+ * 获取我的信息
+ * @return
+ */
+ @ApiOperation(value="获取我的信息", notes="获取我的信息")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberInfoVo.class)})
+ @GetMapping(value = "/getMemberInfo")
+ public Result getMemberInfo() {
+ return memberService.getMemberInfo();
+ }
+
+ /**
+ * 忘记密码
+ * @param code 验证码
+ * @param password 新密码
+ * @param token 用户登录的token
+ * @return
+ */
+ @ApiOperation(value=" 忘记密码", notes=" 忘记密码")
+ @RequestMapping(value="/memberForgetPwd")
+ public Result memberForgetPwd(@RequestBody @Valid MemberForgetPwdDto memberForgetPwdDto) {
+ return memberService.memberForgetPwd(memberForgetPwdDto);
+ }
+
+ /**
+ * 实名认证
+ * @param token
+ * @param memberAuthenVo
+ * @param request
+ * @return
+ */
+ @ApiOperation(value="实名认证", notes="实名认证")
+ @PostMapping(value="/memberAuthentication")
+ public Result memberAuthentication(@RequestBody @Valid MemberAuthenticationDto memberAuthenticationDto) {
+ return memberService.memberAuthentication(memberAuthenticationDto);
+ }
+
+
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberAuthenticationDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberAuthenticationDao.java
new file mode 100644
index 0000000..51e3adb
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberAuthenticationDao.java
@@ -0,0 +1,10 @@
+package com.xcong.excoin.modules.member.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.member.entity.MemberAuthenticationEntity;
+
+public interface MemberAuthenticationDao extends BaseMapper<MemberAuthenticationEntity> {
+
+ int findMemberbyIdCardNoCount(String idCardNo);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
index 6640df7..b2b97f5 100644
--- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
@@ -1,15 +1,16 @@
-package com.xcong.excoin.modules.member.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author wzy
- */
-public interface MemberDao extends BaseMapper<MemberEntity> {
-
- public MemberEntity selectMemberInfoByAccount(@Param("account") String account);
-
- public MemberEntity selectMemberInfoByRefererId(@Param("refererId") String refererId);
-}
+package com.xcong.excoin.modules.member.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author wzy
+ */
+public interface MemberDao extends BaseMapper<MemberEntity> {
+
+ public MemberEntity selectMemberInfoByAccount(@Param("account") String account);
+
+ public MemberEntity selectMemberInfoByRefererId(@Param("refererId") String refererId);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java
index 03af297..3b040b3 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java
@@ -1,56 +1,65 @@
-package com.xcong.excoin.modules.member.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.xcong.excoin.common.system.base.BaseEntity;
-import lombok.Data;
-
-/**
- * 用户实名认证信息实体
- *
- * @author wzy
- * @date 2020-05-18
- **/
-@Data
-@TableName("member_authentication")
-public class MemberAuthenticationEntity extends BaseEntity {
-
- /**
- * 用户ID
- */
- private Long memberId;
-
- /**
- * 真实姓名
- */
- private String realName;
-
- /**
- * 姓
- */
- private String firstName;
-
- /**
- * 名
- */
- private String secondName;
-
- /**
- * 国家
- */
- private String nation;
-
- /**
- * 身份证正面
- */
- private String idcardImageFront;
-
- /**
- * 身份证背面
- */
- private String idcardImageBack;
-
- /**
- * 手持身份证
- */
- private String idcardImageInHand;
-}
+package com.xcong.excoin.modules.member.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+/**
+ * 用户实名认证信息实体
+ *
+ * @author wzy
+ * @date 2020-05-18
+ **/
+@Data
+@TableName("member_authentication")
+public class MemberAuthenticationEntity extends BaseEntity {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户ID
+ */
+ private Long memberId;
+
+ /**
+ * 真实姓名
+ */
+ private String realName;
+
+ /**
+ * 姓
+ */
+ private String firstName;
+
+ /**
+ * 名
+ */
+ private String secondName;
+
+ /**
+ * 国家
+ */
+ private String nation;
+ /**
+ * 身份证号
+ */
+ private String idcardNo;
+
+ /**
+ * 身份证正面
+ */
+ private String idcardImageFront;
+
+ /**
+ * 身份证背面
+ */
+ private String idcardImageBack;
+
+ /**
+ * 手持身份证
+ */
+ private String idcardImageInHand;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java
new file mode 100644
index 0000000..e69031e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java
@@ -0,0 +1,45 @@
+package com.xcong.excoin.modules.member.parameter.dto;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberAuthenticationDto", description = "实名认证参数接收类")
+public class MemberAuthenticationDto {
+
+ @NotNull(message = "姓不能为空")
+ @ApiModelProperty(value = "姓", example = "姓")
+ private String firstName;
+
+ @NotNull(message = "名不能为空")
+ @ApiModelProperty(value = "名", example = "名")
+ private String secondName;
+
+ @NotNull(message = "真实姓名不能为空")
+ @ApiModelProperty(value = "真实姓名", example = "姓名")
+ private String realName;
+
+ @NotNull(message = "身份证卡号不能为空")
+ @ApiModelProperty(value = "身份证卡号", example = "123456789")
+ private String idCardNo;
+
+ @NotNull(message = "身份证正面不能为空")
+ @ApiModelProperty(value = "身份证正面", example = "身份证正面")
+ private String idCardFront;
+
+ @NotNull(message = "身份证反面不能为空")
+ @ApiModelProperty(value = "身份证反面", example = "身份证反面")
+ private String idCardReverse;
+
+ @NotNull(message = "手持身份证不能为空")
+ @ApiModelProperty(value = "手持身份证", example = "手持身份证")
+ private String idCardImage;
+
+ @NotNull(message = "国家不能为空")
+ @ApiModelProperty(value = "国家", example = "国家")
+ private String nation;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java
new file mode 100644
index 0000000..8da3cde
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java
@@ -0,0 +1,31 @@
+package com.xcong.excoin.modules.member.parameter.dto;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberForgetPwdDto", description = "忘记密码参数接收类")
+public class MemberForgetPwdDto {
+
+ @NotNull(message = "验证码不能为空")
+ @ApiModelProperty(value = "验证码", example = "123456")
+ private String code;
+
+ @NotNull(message = "新密码不能为空")
+ @ApiModelProperty(value = "新密码", example = "qq123456")
+ private String password;
+
+ @NotNull(message = "验证类型不能为空")
+ @ApiModelProperty(value = "验证类型 1 手机号码 2 邮箱", example = "1")
+ private int type;
+
+ @ApiModelProperty(value = "电话号码", example = "13412341234")
+ private String phone;
+
+ @ApiModelProperty(value = "邮箱", example = "www.13412341234@123.com")
+ private String email;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java
new file mode 100644
index 0000000..6ab0a86
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java
@@ -0,0 +1,23 @@
+package com.xcong.excoin.modules.member.parameter.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "MemberInfoVo", description = "个人信息")
+public class MemberInfoVo {
+
+ /**
+ * 手机号(包含国际手机号)
+ */
+ @ApiModelProperty(value = "手机号(包含国际手机号)")
+ private String phone;
+
+ /**
+ * 邀请码
+ */
+ @ApiModelProperty(value = "邀请码")
+ private String inviteId;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index 26ca3bd..0a70c84 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -1,16 +1,25 @@
-package com.xcong.excoin.modules.member.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xcong.excoin.common.response.Result;
-import com.xcong.excoin.common.system.dto.RegisterDto;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.test.entity.TestUserEntity;
-
-/**
- * @author wzy
- */
-public interface MemberService extends IService<MemberEntity> {
-
- public Result register(RegisterDto registerDto);
-
-}
+package com.xcong.excoin.modules.member.service;
+
+import javax.validation.Valid;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.common.system.dto.RegisterDto;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
+
+/**
+ * @author wzy
+ */
+public interface MemberService extends IService<MemberEntity> {
+
+ public Result register(RegisterDto registerDto);
+
+ public Result getMemberInfo();
+
+ public Result memberAuthentication(@Valid MemberAuthenticationDto memberAuthenticationDto);
+
+ public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto);
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index cf19f1b..af6f9ec 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -1,11 +1,13 @@
package com.xcong.excoin.modules.member.service.impl;
-import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
-import cn.hutool.crypto.asymmetric.Sign;
-import cn.hutool.crypto.asymmetric.SignAlgorithm;
+import cn.hutool.crypto.digest.MD5;
+
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.SymbolEnum;
@@ -13,13 +15,25 @@
import com.xcong.excoin.common.system.dto.RegisterDto;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
+import com.xcong.excoin.modules.member.parameter.dto.MemberAuthenticationDto;
+import com.xcong.excoin.modules.member.parameter.dto.MemberForgetPwdDto;
+import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
import com.xcong.excoin.modules.member.service.MemberService;
+import com.xcong.excoin.utils.MessageSourceUtils;
+import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.ShareCodeUtil;
import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import javax.annotation.Resource;
+import javax.validation.Valid;
/**
* @author wzy
@@ -43,6 +57,12 @@
@Resource
private MemberLevelRateDao memberLevelRateDao;
+
+ @Resource
+ MemberAuthenticationDao memberAuthenticationDao;
+
+ @Autowired
+ RedisUtils redisUtils;
@Transactional()
@Override
@@ -135,9 +155,147 @@
levelRate.setSymbol(symbolEnum.getValue());
memberLevelRateDao.insert(levelRate);
}
-
-
return Result.ok("success");
}
+ @Override
+ public Result getMemberInfo() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity memberEntity = memberDao.selectById(memberId);
+ MemberInfoVo memberInfoVo = new MemberInfoVo();
+ if (ObjectUtil.isNotEmpty(memberEntity)) {
+ memberInfoVo.setPhone(memberEntity.getPhone());
+ memberInfoVo.setInviteId(memberEntity.getInviteId());
+ }
+ return Result.ok(memberInfoVo);
+ }
+
+ @Override
+ public Result memberForgetPwd(@Valid MemberForgetPwdDto memberForgetPwdDto) {
+
+ int type = memberForgetPwdDto.getType();
+ String phone = memberForgetPwdDto.getPhone();
+ String email = memberForgetPwdDto.getEmail();
+ String code = memberForgetPwdDto.getCode();
+ String password = memberForgetPwdDto.getPassword();
+
+ Map<String, Object> hashMap = new HashMap<>();
+ if(type == 1) {
+ hashMap.put("phone", phone);
+ }else {
+ hashMap.put("email", email);
+ }
+ List<MemberEntity> member = memberDao.selectByMap(hashMap);
+ if (CollUtil.isEmpty(member)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0047"));
+ }
+ boolean verificationCode = verificationCode(type, phone, code, email);
+ if(verificationCode) {
+ MemberEntity memberEntity = member.get(0);
+ memberEntity.setPassword(SecureUtil.md5(password));
+ memberDao.updateById(memberEntity);
+ }else {
+ return Result.fail(MessageSourceUtils.getString("member_service_0045"));
+ }
+ if(type == 1) {
+ redisUtils.del("SMS_" + phone);
+ }else {
+ redisUtils.del("EMAIL_" + email);
+ }
+ return Result.ok(MessageSourceUtils.getString("member_service_0048"));
+ }
+
+ /**
+ * 验证输入的验证码
+ * @param type 验证类型1：电话2：邮箱
+ * @param phone
+ * @param email
+ * @param code 验证码
+ * @return
+ */
+ private boolean verificationCode(Integer type,String phone,String code,String email) {
+ boolean verificationCode = false;
+ if(type == 1) {
+ String smsCode = redisUtils.get("SMS_" + phone) + "";
+ if(code.equals(smsCode)) {
+ verificationCode = true;
+ }
+ }else {
+ String emailCode = redisUtils.get("EMAIL_" + email) + "";
+ if(code.equals(emailCode)) {
+ verificationCode = true;
+ }
+ }
+ return verificationCode;
+ }
+
+ @Override
+ @Transactional
+ public Result memberAuthentication(@Valid MemberAuthenticationDto memberAuthenticationDto) {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ MemberEntity member = memberDao.selectById(memberId);
+ if (ObjectUtil.isNotEmpty(member)) {
+ MemberAuthenticationEntity memberAuthenticationEntity = new MemberAuthenticationEntity();
+ if (MemberEntity.CERTIFY_STATUS_Y == member.getCertifyStatus()) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0055"));
+ }
+ if (MemberEntity.CERTIFY_STATUS_ING == member.getCertifyStatus()) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0056"));
+ }
+ memberAuthenticationEntity.setMemberId(memberId);
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getNation())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0057"));
+ }
+ memberAuthenticationEntity.setNation(memberAuthenticationDto.getNation());
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getFirstName())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0058"));
+ }
+ memberAuthenticationEntity.setFirstName(memberAuthenticationDto.getFirstName());
+
+ if (StrUtil.isBlank(memberAuthenticationDto.getSecondName())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0059"));
+ }
+ memberAuthenticationEntity.setSecondName(memberAuthenticationDto.getSecondName());
+
+ String idCardNo = memberAuthenticationDto.getIdCardNo();
+ if (StrUtil.isBlank(idCardNo)) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+ }
+ memberAuthenticationEntity.setIdcardNo(idCardNo);
+ //同一个身份证号码不能重复实名认证
+ int count = memberAuthenticationDao.findMemberbyIdCardNoCount(idCardNo);
+ if (count > 0) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0060"));
+ }
+ if (StrUtil.isBlank(memberAuthenticationDto.getIdCardFront())
+ || StrUtil.isBlank(memberAuthenticationDto.getIdCardReverse())
+ || StrUtil.isBlank(memberAuthenticationDto.getIdCardImage())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0061"));
+ }
+ memberAuthenticationEntity.setIdcardImageFront(memberAuthenticationDto.getIdCardFront());
+ memberAuthenticationEntity.setIdcardImageBack(memberAuthenticationDto.getIdCardReverse());
+ memberAuthenticationEntity.setIdcardImageInHand(memberAuthenticationDto.getIdCardImage());
+ memberAuthenticationDao.insert(memberAuthenticationEntity);
+
+ member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_ING);
+ member.setIdcardNo(idCardNo);
+ memberDao.updateById(member);
+ /**
+ * TODO dingtalk
+
+ Constant.excutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ DingTalkUtils.sendActionCard(4);
+ }
+ });*/
+ return Result.ok(MessageSourceUtils.getString("member_service_0024"));
+ }
+ return Result.fail(MessageSourceUtils.getString("member_service_0063"));
+ }
+
}
diff --git a/src/main/resources/mapper/member/MemberAuthenticationDao.xml b/src/main/resources/mapper/member/MemberAuthenticationDao.xml
new file mode 100644
index 0000000..8959e65
--- /dev/null
+++ b/src/main/resources/mapper/member/MemberAuthenticationDao.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.member.dao.MemberAuthenticationDao">
+
+ <select id="findMemberbyIdCardNoCount" resultType="int">
+ select count(*) from member_authentication where idcard_No = #{idCardNo}
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/member/MemberDao.xml b/src/main/resources/mapper/member/MemberDao.xml
index a549429..cddbacf 100644
--- a/src/main/resources/mapper/member/MemberDao.xml
+++ b/src/main/resources/mapper/member/MemberDao.xml
@@ -9,4 +9,5 @@
<select id="selectMemberInfoByRefererId" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
select * from member where invite_id=#{refererId}
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1