Skip to content

C
cms
提交 2c669c3e 作者: han
操作

Merge branch 'develop'

上级 2cb2e62f e4f0c2f8
流水线 #8081 已通过 于阶段
in 2 分 21 秒
正在显示 包含 65 行增加 和 16 行删除
cms-common/cms-common-util/src/main/java/com/mmc/iuav/response/ResultEnum.java
......@@ -75,7 +75,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
VALIDATION_INFO_EXPIRED("32815", "认证时间过长信息过期或认证信息不完整，请重新开始认证"),
REAL_IMAGE_AUTHENTICATION_SUCESS("38844", "验证成功"),
REAL_IMAGE_AUTHENTICATION_FAILED("38855", "验证失败，请再次进行人脸识别"),
IDENTITY_HAS_BEEN_AUTHENTICATED("34444", "此身份证信息已经被认证，请重试"),
IDENTITY_HAS_BEEN_AUTHENTICATED("34444", "此身份证信息已经被认证，已经帮你更换为当前用户"),
REAL_NAME_ACCOUNT_ID_ERROR("36771", "账户id错误"),
REAL_NAME_FUSING_ERROR("36772", "认证失败，请重新认证"),
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/RealNameAuthDao.java
......@@ -12,7 +12,7 @@ import java.util.List;
*/
@Mapper
public interface RealNameAuthDao {
int existHasBeenAuth(String unionId, String idNumber);
RealNameAuthDO existHasBeenAuth(String unionId, String idNumber);
RealNameAuthDO getRealNameAuthByUnionId(String unionId);
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java
......@@ -124,17 +124,19 @@ public class AuthServiceImpl implements AuthService {
userAccountDO.setOpenId(openId);
userAccountDO.setPortType(100);
userAccountDO.setSource(wxLoginVO.getSource());
userAccountService.insertUserAccount(userAccountDO);
// userAccountService.insertUserAccount(userAccountDO);
userServiceDao.insertUserAccount(userAccountDO);
userAccountVO = userAccountDO.buildUserAccountVO();
// 创建用户钱包
payWalletService.initPayWallet(userAccountDO.getId());
payClient.createWallet(userAccountDO.getId());
// 查询之前有没有实名过
RealNameAuthDO nameAuthByUnionId = realNameAuthDao.getRealNameAuthBakByUnionId(unionId);
RealNameAuthDO nameAuthByUnionId = realNameAuthDao.getRealNameAuthByUnionId(unionId);
if (nameAuthByUnionId != null) {
nameAuthByUnionId.setUserAccountId(userAccountDO.getId());
nameAuthByUnionId.setId(null);
realNameAuthDao.addRealNameAuth(nameAuthByUnionId);
// nameAuthByUnionId.setId(null);
realNameAuthDao.updateRealNameAuth(nameAuthByUnionId);
}
log.info("用户的id是=====》{}",userAccountDO.getId());
} else {
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RealNameAuthServiceImpl.java
......@@ -7,17 +7,21 @@ import com.mmc.iuav.response.ResultEnum;
import com.mmc.iuav.user.controller.userpoints.config.NumberOfUserPoints;
import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
import com.mmc.iuav.user.dao.RealNameAuthDao;
import com.mmc.iuav.user.dao.UserServiceDao;
import com.mmc.iuav.user.dao.userpoints.UserPointsDao;
import com.mmc.iuav.user.dao.userpoints.UserPointsDetailsDao;
import com.mmc.iuav.user.entity.RealNameAuthDO;
import com.mmc.iuav.user.entity.UserAccountDO;
import com.mmc.iuav.user.entity.userpoints.UserPointsDO;
import com.mmc.iuav.user.entity.userpoints.UserPointsDetails;
import com.mmc.iuav.user.model.dto.RealNameAuthDTO;
import com.mmc.iuav.user.model.dto.RealNameAuthDetailDTO;
import com.mmc.iuav.user.model.qo.RealNameAuthQO;
import com.mmc.iuav.user.model.vo.RealNameAuthVO;
import com.mmc.iuav.user.model.vo.UserAccountVO;
import com.mmc.iuav.user.model.vo.userpoints.UserPointsVO;
import com.mmc.iuav.user.service.RealNameAuthService;
import com.mmc.iuav.user.service.UserAccountService;
import com.mmc.iuav.user.util.RealNameAuthUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -43,17 +47,23 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
@Autowired
private UserPointsDetailsDao userPointsDetailsDao;
@Autowired
private UserServiceDao userServiceDao;
@Override
public ResultBody add(RealNameAuthVO realNameAuthVO) {
log.info("RealNameAuthVO:{}", JSONObject.toJSONString(realNameAuthVO));
UserAccountDO userAccountById = userServiceDao.getUserAccountById(realNameAuthVO.getUserAccountId());
realNameAuthVO.setUnionId(userAccountById.getUnionId());
RealNameAuthDO realNameAuthDO0 = realNameAuthDao.getRealNameAuthByUId(realNameAuthVO.getUserAccountId());
if (realNameAuthDO0 != null && realNameAuthDO0.getCheckStatus().equals(1)) {
return ResultBody.error(ResultEnum.REAL_NAME_PASS_ERROR);
}
// 查询是否已认证
int count = realNameAuthDao.existHasBeenAuth(realNameAuthVO.getUnionId(), realNameAuthVO.getIdNumber());
if (count > 0) {
RealNameAuthDO realNameAuthDO1 = realNameAuthDao.existHasBeenAuth(realNameAuthVO.getUnionId(), realNameAuthVO.getIdNumber());
if (realNameAuthDO1 != null) {
realNameAuthDO1.setUserAccountId(realNameAuthVO.getUserAccountId());
realNameAuthDao.updateRealNameAuth(realNameAuthDO1);
return ResultBody.error(ResultEnum.IDENTITY_HAS_BEEN_AUTHENTICATED);
}
// 校验正面
......@@ -84,6 +94,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
realNameAuthDO.setAddress(faceResultJson.getString("address"));
realNameAuthDO.setNationality(faceResultJson.getString("nationality"));
realNameAuthDO.setIssue(backResultJson.getString("issue"));
realNameAuthDO.setUnionId(realNameAuthVO.getUnionId());
if (faceResultJson.getString("sex").equals("男")) {
realNameAuthDO.setSex(1);
......@@ -156,6 +167,11 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
public ResultBody<RealNameAuthDetailDTO> detail(Integer id) {
RealNameAuthDO realNameAuthDO = realNameAuthDao.getRealNameAuthById(id);
if (realNameAuthDO != null) {
UserAccountDO userAccountById = userServiceDao.getUserAccountById(realNameAuthDO.getUserAccountId());
if(realNameAuthDO.getUnionId() == null || realNameAuthDO.getUnionId().equals("")){
realNameAuthDO.setUnionId(userAccountById.getUnionId());
realNameAuthDao.updateRealNameAuth(realNameAuthDO);
}
return ResultBody.success(realNameAuthDO.buildRealNameAuthDetailDTO());
}
return ResultBody.success();
......@@ -180,6 +196,11 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
public ResultBody<RealNameAuthDTO> userDetail(Integer userAccountId) {
RealNameAuthDO realNameAuthDO = realNameAuthDao.userDetail(userAccountId);
if (realNameAuthDO != null) {
UserAccountDO userAccountById = userServiceDao.getUserAccountById(realNameAuthDO.getUserAccountId());
if(realNameAuthDO.getUnionId() == null || realNameAuthDO.getUnionId().equals("")){
realNameAuthDO.setUnionId(userAccountById.getUnionId());
realNameAuthDao.updateRealNameAuth(realNameAuthDO);
}
return ResultBody.success(realNameAuthDO.buildRealNameAuthDTO());
}
return ResultBody.success();
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java
......@@ -161,7 +161,7 @@ public class UserAccountServiceImpl implements UserAccountService {
userAccountVO.setCompanyInfoVO(companyInfoVO);
}
Integer backUserId = certificationDao.selectBackUserIdByUserId(userAccountId);
log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
// log.info("userAccountId {} 用户对应的backUserId=============》{}",userAccountId,backUserId);
if(backUserId!=null) {
userAccountVO.setBackUserId(backUserId);
}
......
csm-service/cms-service-user/src/main/resources/mapper/RealNameAuthDao.xml
......@@ -64,6 +64,12 @@
<if test=" remark != null and remark != '' ">
remark = #{remark},
</if>
<if test=" unionId != null and unionId != '' ">
union_id = #{unionId},
</if>
<if test=" userAccountId != null and userAccountId != '' ">
user_account_id = #{userAccountId},
</if>
<if test="createTime !=null">
create_time = NOW(),
</if>
......@@ -77,12 +83,31 @@
where id = #{id}
</update>
<select id="existHasBeenAuth" resultType="java.lang.Integer">
select count(*)
from real_name_auth
where union_id <![CDATA[<>]]> #{unionId}
and id_number = #{idNumber}
and check_status = 1
<select id="existHasBeenAuth" resultType="com.mmc.iuav.user.entity.RealNameAuthDO">
select rna.id,
rna.user_account_id,
rna.union_id,
rna.front_id_img,
rna.back_id_img,
rna.id_number,
rna.user_name,
rna.sex,
rna.nationality,
rna.birthday,
rna.address,
rna.issue,
rna.start_date,
rna.end_date,
rna.is_fake_front,
rna.is_fake_back,
rna.check_status,
rna.remark,
rna.create_time
from real_name_auth rna
where rna.id_number = #{idNumber}
and rna.check_status = 1
and rna.is_deleted = 0
limit 1
</select>
<select id="getRealNameAuthByUnionId" resultType="com.mmc.iuav.user.entity.RealNameAuthDO">
......@@ -224,6 +249,7 @@
from real_name_auth rna
where rna.user_account_id = #{userAccountId}
and rna.is_deleted = 0
limit 1
</select>
<select id="getRealNameAuthCount" resultType="java.lang.Integer">
SELECT count(*)
......
kustomization/overlays/dev/kustomization.yaml
......@@ -18,4 +18,4 @@ patches:
images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
newTag: e51804b695f56ae3b1ad3615b2257b8f28bb858d
newTag: 679ca4db1456e36db20111c8d4d086d33ca31b31
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论