活体验证记录新增字段

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

@@ -16,6 +16,13 @@ public class FaceCompareRsp {
     private String idCard;
     private String url;
     private Date createTime;
+    //聚合orderId
     private String orderId;
     private Integer type;
-}
+    private String contractType;
+    private String prodId;
+    private String autoGenerate;
+    private String OrderStatus;
+    //公证订单，系统内部的orderId
+    private String notarizationOrderId;
+}

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -19,9 +19,9 @@ import me.zhengjie.base.plus.QueryWrapperUtil;
 import me.zhengjie.base.util.*;
 import me.zhengjie.base.util.StatusEnum.NotaryStatusEnum;
 import me.zhengjie.dao.mybatis.ContractOrderRepository;
+import me.zhengjie.dao.mybatis.FaceCompareRepository;
 import me.zhengjie.dao.mybatis.ModelRepository;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
-import me.zhengjie.dao.mybatis.FaceCompareRepository;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.domain.img.CompareImageDomain;
@@ -409,9 +409,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
             qw.eq("type",type);
         }
         String format = DateFormatUtils.format(new Date());
-        qw.between("create_time",format+" 00:00:00",format+" 23:59:59");
+//        qw.between("create_time",format+" 00:00:00",format+" 23:59:59");
         qw.orderByDesc("create_time");
-        List<FaceCompareRsp> faceCompareRspList = thirdPartyInterfaceRepository.page(page,qw);
+
+        List<FaceCompareRsp> faceCompareRspList = thirdPartyInterfaceRepository.page(page,qw,contractOrderMapper);
 
         response.setData(new AppResultData<List<FaceCompareRsp>>(faceCompareRspList,new me.zhengjie.base.Page(req.getIndex(), req.getSize(), (int) page.getTotal())));
         return response;

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

@@ -6,10 +6,13 @@ import lombok.RequiredArgsConstructor;
 import me.zhengjie.application.admin.controller.vo.FaceCompareRsp;
 import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.util.FileUploadUtil;
-import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
+import me.zhengjie.dao.mybatis.entity.ContractOrderEntity;
 import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
-import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
+import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
+import me.zhengjie.dao.mybatis.mapper.ContractOrderMapper;
 import me.zhengjie.dao.mybatis.mapper.FaceCompareMapper;
+import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
+import org.apache.http.util.TextUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -21,15 +24,16 @@ import java.util.List;
 public class FaceCompareRepository {
     private final FaceCompareMapper thirdPartyInterfaceMapper;
     private final FileInfoMapper fileInfoMapper;
-    public void insert(FaceCompareEntity thirdPartyInterfaceEntity){
+
+    public void insert(FaceCompareEntity thirdPartyInterfaceEntity) {
         thirdPartyInterfaceEntity.setCreateTime(new Date());
         thirdPartyInterfaceMapper.insert(thirdPartyInterfaceEntity);
     }
 
-    public List<FaceCompareRsp> page(IPage<FaceCompareEntity> page, QueryWrapper<FaceCompareEntity> qw) {
-        IPage<FaceCompareEntity> thirdPartyInterfaceEntityIPage = thirdPartyInterfaceMapper.selectPage(page,qw);
+    public List<FaceCompareRsp> page(IPage<FaceCompareEntity> page, QueryWrapper<FaceCompareEntity> qw, ContractOrderMapper contractOrderMapper) {
+        IPage<FaceCompareEntity> thirdPartyInterfaceEntityIPage = thirdPartyInterfaceMapper.selectPage(page, qw);
         List<FaceCompareRsp> faceCompareRspList = new ArrayList<>();
-        for (FaceCompareEntity thirdPartyInterfaceEntity:thirdPartyInterfaceEntityIPage.getRecords()){
+        for (FaceCompareEntity thirdPartyInterfaceEntity : thirdPartyInterfaceEntityIPage.getRecords()) {
             FaceCompareRsp faceCompareRsp = BeanCopyUtils.convertObj(thirdPartyInterfaceEntity, FaceCompareRsp.class);
             String fileId = thirdPartyInterfaceEntity.getFileId();
             FileInfoEntity fileInfoEntity = fileInfoMapper.selectById(fileId);
@@ -40,6 +44,18 @@ public class FaceCompareRepository {
                 throw new RuntimeException(e);
             }
             faceCompareRsp.setUrl(previewUrl);
+            if (!TextUtils.isEmpty(faceCompareRsp.getConsultNo())) {
+                QueryWrapper<ContractOrderEntity> orderQw = new QueryWrapper<>();
+                orderQw.like("consult_no", faceCompareRsp.getConsultNo());
+                ContractOrderEntity entity = contractOrderMapper.selectOne(orderQw);
+                if (null != entity) {
+                    faceCompareRsp.setOrderStatus(entity.getStatus());
+                    faceCompareRsp.setAutoGenerate(entity.getAutoGenerate());
+                    faceCompareRsp.setProdId(entity.getProdId());
+                    faceCompareRsp.setContractType(entity.getContractType() + "");
+                    faceCompareRsp.setNotarizationOrderId(entity.getId()+"");
+                }
+            }
             faceCompareRspList.add(faceCompareRsp);
         }
         return faceCompareRspList;