人脸核身验证信息记录

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/CompareImageVo.java

@@ -14,6 +14,10 @@ public class CompareImageVo {
     @NotNull(message = "图片base64不能为空")
     @ApiModelProperty(value = "base64不为空")
     private String base64;
+
+    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty(value = "订单编号不为空")
+    private String businessNo;
     @NotNull(message = "身份证号不能为空")
     @ApiModelProperty(value = "身份证号不为空")
     private String idCard;

eladmin-system/src/main/java/me/zhengjie/application/admin/service/dto/CompareImageDto.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.NotNull;
 public class CompareImageDto {
 
     private String base64;
+    private String businessNo;
 
     private String idCard;
 

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/CompareImageVo.java

@@ -9,6 +9,10 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class CompareImageVo {
+
+    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty(value = "订单编号不为空")
+    private String businessNo;
     // 图片的base64编码
     @NotNull(message = "图片base64不能为空")
     @ApiModelProperty(value = "base64不为空")

eladmin-system/src/main/java/me/zhengjie/application/bank/service/dao/CompareImageDto.java

@@ -9,11 +9,9 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class CompareImageDto {
-
+    private String businessNo;
     private String base64;
-
     private String idCard;
-
     private String name;
 
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ThirdPartyInterfaceRepository.java

@@ -33,24 +33,6 @@ public class ThirdPartyInterfaceRepository {
 
 
     public void insert(ThirdPartyInterfaceEntity thirdPartyInterfaceEntity){
-        //里面如果能查到用户和idcard的信息 就不会用银行经理查询 反之 则用银行经理查询
-        QueryWrapper<ContractOrderEntity> contractOrderEntityQueryWrapper = new QueryWrapper<>();
-        String partyName = thirdPartyInterfaceEntity.getName();
-        String idCard = thirdPartyInterfaceEntity.getIdCard();
-        contractOrderEntityQueryWrapper.eq("id_card",idCard).eq("name",partyName);
-        ContractOrderEntity contractOrder = contractOrderMapper.selectOne(contractOrderEntityQueryWrapper);
-        String businessNo = null;
-        if (!ObjectUtils.isEmpty(contractOrder)){
-            businessNo = contractOrder.getBusinessNo();
-        }else {
-            QueryWrapper<ContractOrderEntity> contractOrderQuery = new QueryWrapper<>();
-            //客户经理最近的一个订单 当作做人脸核身的订单
-            contractOrderQuery.eq("customer_name",partyName).orderByDesc("update_time");
-            List<ContractOrderEntity> contractOrderEntities = contractOrderMapper.selectList(contractOrderQuery);
-            ContractOrderEntity contractOrderEntity = contractOrderEntities.get(0);
-            businessNo=contractOrderEntity.getBusinessNo();
-        }
-        thirdPartyInterfaceEntity.setBusinessNo(businessNo);
         thirdPartyInterfaceEntity.setCreateTime(new Date());
         thirdPartyInterfaceMapper.insert(thirdPartyInterfaceEntity);
     }

eladmin-system/src/main/java/me/zhengjie/domain/img/CompareImageDomain.java

@@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class CompareImageDomain {
     private String base64;
+    private String businessNo;
     private String idCard;
     private String name;
     private String roleId;

eladmin-system/src/main/java/me/zhengjie/domain/notary/impl/NotaryDomainImpl.java

@@ -15,10 +15,8 @@ import me.zhengjie.base.file.MinioFileHandle;
 import me.zhengjie.base.util.JuheServiceUtil;
 import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
 import me.zhengjie.dao.mybatis.ThirdPartyInterfaceRepository;
-import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
-import me.zhengjie.dao.mybatis.entity.SysUserEntity;
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
-import me.zhengjie.dao.mybatis.entity.UserAXQInfoEntity;
+import me.zhengjie.dao.mybatis.entity.*;
+import me.zhengjie.dao.mybatis.mapper.ContractOrderMapper;
 import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
 import me.zhengjie.dao.mybatis.mapper.SysUserMapper;
 import me.zhengjie.dao.mybatis.mapper.UserAXQInfoMapper;
@@ -44,6 +42,7 @@ public class NotaryDomainImpl implements NotaryDomain {
 
     private final SysUserMapper userMapper;
     private final UserAXQInfoMapper userAXQInfoMapper;
+    private final ContractOrderMapper contractOrderMapper;
     private final FaceMinioFileHandle minioFileHandle;
     private final FileInfoMapper fileInfoMapper;
     private final RedisUtils redis;
@@ -114,6 +113,7 @@ public class NotaryDomainImpl implements NotaryDomain {
         FileInfoEntity fileInfo = saveCompareImage(base);
         fileInfoMapper.insert(fileInfo);
         thirdPartyInterfaceEntity.setFileId(fileInfo.getId()+"");
+        thirdPartyInterfaceEntity.setBusinessNo(compareImageDomain.getBusinessNo());
         if (StringUtils.isNotBlank(thirdPartyInterfaceEntity.getMessage())){
             //没有message说明人脸核身成功
             UserAXQInfoEntity userAxq = new UserAXQInfoEntity();
@@ -150,6 +150,12 @@ public class NotaryDomainImpl implements NotaryDomain {
         boolean flag = "-1".equals(roleId);
         if (flag) {
             //说明是银行客户经理
+            QueryWrapper<ContractOrderEntity> contractOrderEntityQueryWrapper = new QueryWrapper<>();
+            contractOrderEntityQueryWrapper.eq("business_no",compareImageDomain.getBusinessNo()).eq("customer_name",compareImageDomain.getName());
+            ContractOrderEntity contractOrderEntity = contractOrderMapper.selectOne(contractOrderEntityQueryWrapper);
+            if (ObjectUtils.isEmpty(contractOrderEntity)){
+                return ResultCode.ACCOUNT_MANAGER_NO_ASSIGNED;
+            }
             QueryWrapper<SysUserEntity> sysUserEntityQueryWrapper = new QueryWrapper<>();
             sysUserEntityQueryWrapper.eq("id_card", idCard).eq("nick_name", nickName);
             sysUserEntity = userMapper.selectOne(sysUserEntityQueryWrapper);
@@ -191,6 +197,7 @@ public class NotaryDomainImpl implements NotaryDomain {
                 //说明客户经理需要做人脸核身
                 ThirdPartyInterfaceEntity thirdPartyInterfaceEntity = JuheServiceUtil.URLPost(idCard, nickName, base64);
                 thirdPartyInterfaceEntity.setFileId(fileInfo.getId()+"");
+                thirdPartyInterfaceEntity.setBusinessNo(compareImageDomain.getBusinessNo());
                 if (StringUtils.isNotBlank(thirdPartyInterfaceEntity.getMessage())){
                     //上传图片到minio FileInfo
                     SysUserEntity bank = new SysUserEntity();
@@ -212,6 +219,7 @@ public class NotaryDomainImpl implements NotaryDomain {
                 //说明当事人需要做人脸核身
                 ThirdPartyInterfaceEntity thirdPartyInterfaceEntity = JuheServiceUtil.URLPost(idCard, nickName, base64);
                 thirdPartyInterfaceEntity.setFileId(fileInfo.getId()+"");
+                thirdPartyInterfaceEntity.setBusinessNo(compareImageDomain.getBusinessNo());
                 if (thirdPartyInterfaceEntity.getResult()==1){
                     //上传图片到minio FileInfo
                     UserAXQInfoEntity userAxq = new UserAXQInfoEntity();