Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

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

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

@@ -11,6 +11,7 @@ import me.zhengjie.application.admin.controller.vo.NotaryOrderQueryRsp;
 import me.zhengjie.application.admin.controller.vo.PartyEntity;
 import me.zhengjie.application.admin.service.AdminOrderService;
 import me.zhengjie.application.bank.controller.vo.FileVo;
+import me.zhengjie.application.bank.controller.vo.OrderDetailDto;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
 import me.zhengjie.base.ResultCode;
@@ -39,171 +40,170 @@ import java.util.List;
 @RequiredArgsConstructor
 public class AdminOrderController {
 
-    private final AdminOrderService adminOrderService;
-
-    /**
-     * 公证订单 查询
-     *
-     * @return
-     */
-    @RequestMapping("/query")
-    public AppBaseResponse<List<NotaryOrderQueryRsp>> query(@RequestBody NotaryOrderQueryReq req) {
-        return adminOrderService.query(req);
-    }
-
-    /**
-     * 查询 客户经理信息
-     *
-     * @return
-     */
-    @RequestMapping("/customerInfo")
-    public AppBaseResponse<NotaryOrderQueryRsp> getCustomerInfo(@RequestBody HashMap<String,String> map) {
-        return adminOrderService.getCustomerInfo(map);
-    }
-
-    /**
-     * 查询订单详情
-     *
-     * @param map
-     * @return
-     */
-    @RequestMapping("/info")
-    public AppBaseResponse<AdminOrderVO> orderInfo(@RequestBody HashMap<String, String> map) {
-        AppBaseResponse response = new AppBaseResponse();
-        String businessNo = map.get("businessNo");
-        String contractNo = map.get("contractNo");
-        response.setData(new AppResultData<AdminOrderVO>(adminOrderService.info(businessNo, contractNo)));
-        return response;
-    }
-
-    
-    /**
-     * 查询订单详情
-     *
-     * @param map
-     * @return
-     */
-    @RequestMapping("/orderDetail")
-    public AppBaseResponse<AdminOrderVO> orderDetail(@RequestBody HashMap<String, String> map) {
-        AppBaseResponse response = new AppBaseResponse();
-        String businessNo = map.get("businessNo");
-        String contractNo = map.get("contractNo");
-        response.setData(new AppResultData<AdminOrderVO>(adminOrderService.info(businessNo, contractNo)));
-        return response;
-    }
-
-    
-    /**
-     * 公证订单 查询 当事人
-     *
-     * @return
-     */
-    @RequestMapping("/partys")
-    public AppBaseResponse<List<PartyEntity>> partys(@RequestBody HashMap<String,String> map) {
-        return adminOrderService.partys(map);
-    }
-
-    /**
-     * 订单问询人列表
-     *
-     * @return
-     */
-    @RequestMapping("/orderQueryUser")
-    public AppBaseResponse<List<PartyEntity>> orderQueryUser(@RequestBody HashMap<String, String> map) {
-        return adminOrderService.orderQueryUser(map);
-    }
-
-    /**
-     * 公证订单 退回
-     *
-     * @return
-     */
-    @RequestMapping("/orderReturn")
-    public AppBaseResponse orderReturn(@RequestBody NotaryOrderQueryReq req) {
-        return adminOrderService.orderReturn(req);
-    }
-
-    /**
-     * 公证订单 驳回
-     *
-     * @return
-     */
-    @AnonymousPostMapping("/orderReject")
-    public AppBaseResponse orderReject(@RequestBody NotaryOrderQueryReq req) {
-        return adminOrderService.orderReject(req);
-    }
-
-    /**
-     * 公证订单  当事人 通过
-     *
-     * @return
-     */
-    @RequestMapping("/partyPass")
-    public AppBaseResponse partyPass(@RequestBody NotaryOrderQueryReq req) {
-        return adminOrderService.partyPass(req);
-    }
-
-    /**
-     * 公证订单信息审核通过
-     * @param req
-     * @return
-     */
-    @AnonymousPostMapping("/checkInfoPass")
-    public AppBaseResponse checkInfoPass(@RequestBody NotaryOrderQueryReq req) {
-        return adminOrderService.checkInfoPass(req);
-    }
-
-
-
-    /**
-     * 公证订单 人体合身验证
-     * @param file
-     * @param idCard
-     * @param name
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping("/auth")
-    public me.zhengjie.base.BaseResponse auth(@RequestParam MultipartFile file, @RequestParam String idCard, @RequestParam String name){
-        me.zhengjie.base.BaseResponse response = new me.zhengjie.base.BaseResponse();
-        byte[] fileByte = null;
-        try {
-            fileByte = file.getBytes();
-        } catch (IOException e) {
-            response.fail(ResultCode.LIVE_VIDEO_CONVERSION.code()+"","图像文件转码失败！");
-            return response;
-        }
-        String imageBase64 = Base64.getEncoder().encodeToString(fileByte);
-        String result = TencentUtil.FaceImageBody(idCard, name, imageBase64);
-        JSONObject object = JSON.parseObject(result);
-        Float sim = Float.parseFloat(object.getString("Sim"));
-        log.info("认证入参：" + idCard + "/" + name);
-        log.info("识别值：" + sim);
-        if (sim > 70) { // 大于70 认为是同一个人
-            response.success("认证成功");
-        } else {
-            response.fail(ResultCode.LIVE_VIDEO_INVALID.code()+"", ResultCode.LIVE_VIDEO_INVALID.message());
-        }
-        return response;
-    }
-    @RequestMapping("/preview")
-    public AppBaseResponse previewNotarization(@RequestBody NotaryOrderQueryReq req){
-        return adminOrderService.previewNotarization(req);
-    }
-
-    @AnonymousPostMapping("/bankCustomer")
-    public AppBaseResponse bankCustomer(@RequestBody NotaryOrderQueryReq req){
-        return adminOrderService.bankCustomer(req);
-    }
-
-    @AnonymousPostMapping("/uploadNotarization")
-    public AppBaseResponse uploadNotarization(@RequestBody FileVo file) {
-        return adminOrderService.uploadNotarization(file);
-    }
-
-    @AnonymousPostMapping("/getDocList")
-    public AppBaseResponse getDocList(@RequestBody NotaryOrderQueryReq req){
-        return adminOrderService.getDocList(req);
-    }
+	private final AdminOrderService adminOrderService;
+
+	/**
+	 * 公证订单 查询
+	 *
+	 * @return
+	 */
+	@RequestMapping("/query")
+	public AppBaseResponse<List<NotaryOrderQueryRsp>> query(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.query(req);
+	}
+
+	/**
+	 * 查询 客户经理信息
+	 *
+	 * @return
+	 */
+	@RequestMapping("/customerInfo")
+	public AppBaseResponse<NotaryOrderQueryRsp> getCustomerInfo(@RequestBody HashMap<String, String> map) {
+		return adminOrderService.getCustomerInfo(map);
+	}
+
+	/**
+	 * 查询订单详情
+	 *
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping("/info")
+	public AppBaseResponse<AdminOrderVO> orderInfo(@RequestBody HashMap<String, String> map) {
+		AppBaseResponse response = new AppBaseResponse();
+		String businessNo = map.get("businessNo");
+		String contractNo = map.get("contractNo");
+		response.setData(new AppResultData<AdminOrderVO>(adminOrderService.info(businessNo, contractNo)));
+		return response;
+	}
+
+	/**
+	 * 查询订单详情
+	 *
+	 * @param map
+	 * @return
+	 */
+	@RequestMapping("/orderDetail")
+	public AppBaseResponse<OrderDetailDto> orderDetail(@RequestBody HashMap<String, String> map) {
+		AppBaseResponse<OrderDetailDto> response = new AppBaseResponse<>();
+		String businessNo = map.get("businessNo");
+		OrderDetailDto orderDetail = adminOrderService.getOrderDetail(businessNo);
+		response.setResult(orderDetail);
+		return response;
+	}
+
+	/**
+	 * 公证订单 查询 当事人
+	 *
+	 * @return
+	 */
+	@RequestMapping("/partys")
+	public AppBaseResponse<List<PartyEntity>> partys(@RequestBody HashMap<String, String> map) {
+		return adminOrderService.partys(map);
+	}
+
+	/**
+	 * 订单问询人列表
+	 *
+	 * @return
+	 */
+	@RequestMapping("/orderQueryUser")
+	public AppBaseResponse<List<PartyEntity>> orderQueryUser(@RequestBody HashMap<String, String> map) {
+		return adminOrderService.orderQueryUser(map);
+	}
+
+	/**
+	 * 公证订单 退回
+	 *
+	 * @return
+	 */
+	@RequestMapping("/orderReturn")
+	public AppBaseResponse orderReturn(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.orderReturn(req);
+	}
+
+	/**
+	 * 公证订单 驳回
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/orderReject")
+	public AppBaseResponse orderReject(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.orderReject(req);
+	}
+
+	/**
+	 * 公证订单 当事人 通过
+	 *
+	 * @return
+	 */
+	@RequestMapping("/partyPass")
+	public AppBaseResponse partyPass(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.partyPass(req);
+	}
+
+	/**
+	 * 公证订单信息审核通过
+	 * 
+	 * @param req
+	 * @return
+	 */
+	@AnonymousPostMapping("/checkInfoPass")
+	public AppBaseResponse checkInfoPass(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.checkInfoPass(req);
+	}
+
+	/**
+	 * 公证订单 人体合身验证
+	 * 
+	 * @param file
+	 * @param idCard
+	 * @param name
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/auth")
+	public me.zhengjie.base.BaseResponse auth(@RequestParam MultipartFile file, @RequestParam String idCard,
+			@RequestParam String name) {
+		me.zhengjie.base.BaseResponse response = new me.zhengjie.base.BaseResponse();
+		byte[] fileByte = null;
+		try {
+			fileByte = file.getBytes();
+		} catch (IOException e) {
+			response.fail(ResultCode.LIVE_VIDEO_CONVERSION.code() + "", "图像文件转码失败！");
+			return response;
+		}
+		String imageBase64 = Base64.getEncoder().encodeToString(fileByte);
+		String result = TencentUtil.FaceImageBody(idCard, name, imageBase64);
+		JSONObject object = JSON.parseObject(result);
+		Float sim = Float.parseFloat(object.getString("Sim"));
+		log.info("认证入参：" + idCard + "/" + name);
+		log.info("识别值：" + sim);
+		if (sim > 70) { // 大于70 认为是同一个人
+			response.success("认证成功");
+		} else {
+			response.fail(ResultCode.LIVE_VIDEO_INVALID.code() + "", ResultCode.LIVE_VIDEO_INVALID.message());
+		}
+		return response;
+	}
+
+	@RequestMapping("/preview")
+	public AppBaseResponse previewNotarization(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.previewNotarization(req);
+	}
+
+	@AnonymousPostMapping("/bankCustomer")
+	public AppBaseResponse bankCustomer(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.bankCustomer(req);
+	}
+
+	@AnonymousPostMapping("/uploadNotarization")
+	public AppBaseResponse uploadNotarization(@RequestBody FileVo file) {
+		return adminOrderService.uploadNotarization(file);
+	}
+
+	@AnonymousPostMapping("/getDocList")
+	public AppBaseResponse getDocList(@RequestBody NotaryOrderQueryReq req) {
+		return adminOrderService.getDocList(req);
+	}
 }
-

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

@@ -70,7 +70,7 @@ public class NotaryOrderQueryReq extends BaseRequest {
 
 
     // 查询使用
-    private Integer id;
+    private String id;
 
     // 退户原因
     private String returnReason;

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

@@ -18,6 +18,8 @@ import lombok.Setter;
 @Setter
 @ToString
 public class NotaryOrderQueryRsp {
+	//主键
+	private String id;
 	// 业务编号
 	private String businessNo;
 	// 产品类型
@@ -37,6 +39,9 @@ public class NotaryOrderQueryRsp {
 	private String bankName;
 	// 客户经理
 	private String customerName;
+	//'所属银行id',
+	private String bankId; 
+	
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime createTime;

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

@@ -51,7 +51,7 @@ public interface AdminOrderService {
 
     AppBaseResponse<String> previewNotarization(NotaryOrderQueryReq req);
 
-    AppBaseResponse<NotaryOrderQueryRsp> bankCustomer(NotaryOrderQueryReq req);
+    AppBaseResponse<?> bankCustomer(NotaryOrderQueryReq req);
 
     AppBaseResponse uploadNotarization(FileVo file);
 

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

@@ -15,6 +15,7 @@ import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.application.bank.service.FileInfoService;
 import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.application.bank.service.impl.NotaryNoteServiceImpl;
+import me.zhengjie.application.bank.controller.vo.BankCustomerVo;
 import me.zhengjie.application.bank.controller.vo.FileVo;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.plus.QueryWrapperUtil;
@@ -321,8 +322,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	}
 
 	@Override
-	public AppBaseResponse checkInfoPass(NotaryOrderQueryReq req) {
-		AppBaseResponse response = new AppBaseResponse();
+	public AppBaseResponse<?> checkInfoPass(NotaryOrderQueryReq req) {
+		AppBaseResponse<?> response = new AppBaseResponse();
 		String currentUserId = String.valueOf(contextUtil.getCurrentUserId());
 		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
 		contractOrderEntity.setStatus(StatusEnum.NotaryStatusEnum.NOTARIZED.getStatus().toString());
@@ -433,8 +434,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	 * @return
 	 */
 	@Override
-	public AppBaseResponse<NotaryOrderQueryRsp> bankCustomer(NotaryOrderQueryReq req) {
-		AppBaseResponse response = new AppBaseResponse();
+	public AppBaseResponse<String> bankCustomer(NotaryOrderQueryReq req) {
+		AppBaseResponse<String> response = new AppBaseResponse<>();
 		try {
 			ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
 			SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
@@ -442,14 +443,15 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 					&& contractOrderEntity.getNotaryOfficeId().equals(user.getOrgId().split("_")[1])) {
 				SysUserEntity customer = userDao.selectById(contractOrderEntity.getCustomerId());
 				BankEntity bankEntity = bankMapper.selectById(customer.getOrgId().split("_")[1]);
-				NotaryOrderQueryRsp returnData = new NotaryOrderQueryRsp();
-				returnData.setBankName(bankEntity.getBankName());
-//				returnData.setCustomerIdCard(customer.getIdCard());
-//				returnData.setCustomerName(customer.getNickName());
-//				returnData.setCustomerPhone(customer.getPhone());
-//				returnData.setCustomerGender(customer.getGender());
-//				returnData.setCustomerLogo(customer.getAvatarName());
-				response.setData(new AppResultData<NotaryOrderQueryRsp>(returnData));
+
+				BankCustomerVo customerVo = new BankCustomerVo();
+				customerVo.setBankName(bankEntity.getBankName());
+				customerVo.setCustomerIdCard(customer.getIdCard());
+				customerVo.setCustomerName(customer.getNickName());
+				customerVo.setCustomerPhone(customer.getPhone());
+				customerVo.setCustomerGender(customer.getGender());
+				customerVo.setCustomerLogo(customer.getAvatarName());
+				response.setResult(customerVo);
 			} else {
 				response.fail(ResultCode.INTERFACE_ILLEGAL_REQUEST);
 			}
@@ -481,6 +483,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		FileInfoEntity fileInfoEntity = fileInfoService.getById(file.getImageId());
 		OrderFileEntity notaryOrderFile = new OrderFileEntity();
 		notaryOrderFile.setBusinessNo(file.getBusinessNo());
+
 		notaryOrderFile.setCode(code);
 		notaryOrderFile.setSignedPdfUrl(fileInfoEntity.getPath());
 		notaryOrderFile.setCreateTime(new Date());
@@ -511,8 +514,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 			}
 		};
 
-
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),"1,2,3,4,5,6".split(","));
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(req.getBusinessNo(),
+				"1,2,3,4,5,6".split(","));
 
 		List<Map<String, String>> fileList = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
@@ -561,10 +564,10 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		}
 		// 进行图片拼接，按上传顺序处理
 		// 身份证正面
-		String cardFrontImageUrl = fileInfoService.getImageUrl(orderDetail.getIdCardFrontPic(), map);
+		String cardFrontImageUrl = fileInfoService.getImageUrl(orderDetail.getIdcardFrontPic(), map);
 		orderDetail.setCardFrontUrl(cardFrontImageUrl);
 		// 身份证反面
-		String cardBackImageUrl = fileInfoService.getImageUrl(orderDetail.getIdCardBackPic(), map);
+		String cardBackImageUrl = fileInfoService.getImageUrl(orderDetail.getIdcardBackPic(), map);
 		orderDetail.setCardBackUrl(cardBackImageUrl);
 		// 3.结婚证
 		List<String> marragePicUrl = fileInfoService.getImageUrlList(orderDetail.getMarragePic(), map);
@@ -583,11 +586,26 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		List<String> otherUploadUrl = fileInfoService.getImageUrlList(otherUpload, map);
 		orderDetail.setOtherUploadUrl(otherUploadUrl);
 		// 共同责任人身份证正面照片
-		String jointIdCardFront = fileInfoService.getImageUrl(orderDetail.getJointIdCardFrontPic(), map);
-		orderDetail.setJointIdCardFrontPic(jointIdCardFront);
+		String jointIdCardFront = fileInfoService.getImageUrl(orderDetail.getJointIdcardFrontPic(), map);
+		orderDetail.setJointIdcardFrontPic(jointIdCardFront);
 		// 共同责任人身份证反面照片
-		String jointIdCardBack = fileInfoService.getImageUrl(orderDetail.getJointIdCardBackPic(), map);
-		orderDetail.setJointIdCardBackPic(jointIdCardBack);
+		String jointIdCardBack = fileInfoService.getImageUrl(orderDetail.getJointIdcardBackPic(), map);
+		orderDetail.setJointIdcardBackPic(jointIdCardBack);
+		OrderFileEntity notarization = orderFileRepository.getOrderNotarization(businessNo);
+		OrderFileEntity note = orderFileRepository.getOrderNote(businessNo);
+		if (notarization != null) {
+			orderDetail.setNotarizationNo(notarization.getDocNo());
+			orderDetail.setNotarizaitonSignTime(notarization.getAxqSignedTime());
+			orderDetail.setAuthNotarization(FileUploadUtil.getPreviewUrl(notarization.getSignedPdfUrl()));
+		}
+		if (note != null) {
+			orderDetail.setAuthNote(FileUploadUtil.getPreviewUrl(note.getSignedPdfUrl()));
+		}
+		if (!StringUtils.isEmpty(orderDetail.getNotaryUserId())) {
+			SysUserEntity user = userMapper.selectById(orderDetail.getNotaryUserId());
+			orderDetail.setNotaryUserName(user.getNickName());
+			orderDetail.setNotaryFee(200);
+		}
 		return orderDetail;
 	}
 
@@ -636,9 +654,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		List<Integer> list = new ArrayList<Integer>();
 
 		// 身份证正面
-		list.add(Integer.parseInt(orderDetail.getIdCardFrontPic()));
+		list.add(Integer.parseInt(orderDetail.getIdcardFrontPic()));
 		// 身份证反面
-		list.add(Integer.parseInt(orderDetail.getIdCardBackPic()));
+		list.add(Integer.parseInt(orderDetail.getIdcardBackPic()));
 		// 3.结婚证
 		addImageId(list, orderDetail.getMarragePic());
 		// 4.合同附件
@@ -648,9 +666,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// 6.户口本
 		addImageId(list, orderDetail.getHkbPic());
 		// 7.共同责任人身份证正面照片
-		addImageId(list, orderDetail.getJointIdCardFrontPic());
+		addImageId(list, orderDetail.getJointIdcardFrontPic());
 		// 8.共同责任人身份证反面照片
-		addImageId(list, orderDetail.getJointIdCardBackPic());
+		addImageId(list, orderDetail.getJointIdcardBackPic());
 		// 其他内容
 		String otherUpload = orderDetail.getOtherUpload();
 		if (org.apache.commons.lang3.StringUtils.isNotBlank(otherUpload)) {

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

@@ -0,0 +1,28 @@
+package me.zhengjie.application.bank.controller.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class BankCustomerVo {
+//	customerVo.setCustomerIdCard(customer.getIdCard());
+//	customerVo.setCustomerName(customer.getNickName());
+//	customerVo.setCustomerPhone(customer.getPhone());
+//	customerVo.setCustomerGender(customer.getGender());
+//	customerVo.setCustomerLogo(customer.getAvatarName());
+	private String bankName;
+	private String CustomerIdCard;
+	private String customerName;
+	private String customerPhone;
+	private String customerGender;
+	private String customerLogo;
+//	returnData.setBankName(bankEntity.getBankName());
+//	returnData.setCustomerIdCard(customer.getIdCard());
+//	returnData.setCustomerName(customer.getNickName());
+//	returnData.setCustomerPhone(customer.getPhone());
+//	returnData.setCustomerGender(customer.getGender());
+//	returnData.setCustomerLogo(customer.getAvatarName());
+}

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

@@ -1,5 +1,6 @@
 package me.zhengjie.application.bank.controller.vo;
 
+import java.util.Date;
 import java.util.List;
 
 import lombok.Getter;
@@ -11,7 +12,7 @@ import lombok.ToString;
 @Setter
 public class OrderDetailDto {
 	// 主键
-	private Integer id;
+	private String id;
 	/**
 	 * 业务编号
 	 */
@@ -76,7 +77,7 @@ public class OrderDetailDto {
 	/**
 	 * 身份证正面照片
 	 */
-	private String idCardFrontPic;
+	private String idcardFrontPic;
 	/**
 	 * 身份证正面pic
 	 */
@@ -84,7 +85,7 @@ public class OrderDetailDto {
 	/**
 	 * 身份证反面
 	 */
-	private String idCardBackPic;
+	private String idcardBackPic;
 
 	private String cardBackUrl;
 
@@ -130,10 +131,10 @@ public class OrderDetailDto {
 	private String jointIdcard; // '共同责任人身份证号码',
 	private String jointName; // '共同责任人姓名',
 	private String jointPhone;// '共同责任人手机号',
-	private String jointIdCardFrontPic; // '共同责任人身份证正面照片',
-	private String jointIdCardFrontPicUrl; // '共同责任人身份证正面照片',
-	private String jointIdCardBackPic; // '共同责任人身份证反面照片',
-	private String jointIdCardBackPicUrl; // '共同责任人身份证反面照片',
+	private String jointIdcardFrontPic; // '共同责任人身份证正面照片',
+	private String jointIdcardFrontPicUrl; // '共同责任人身份证正面照片',
+	private String jointIdcardBackPic; // '共同责任人身份证反面照片',
+	private String jointIdcardBackPicUrl; // '共同责任人身份证反面照片',
 	private String jointSex;// '共同责任人性别(1:男,2:女)',
 	private String bankId; // '所属银行id',
 	private String bankName; // '所属银行',
@@ -150,5 +151,11 @@ public class OrderDetailDto {
 	private String creditLimit; // '授信额度',
 	private String creditStartDate;// '授信起始日期',
 	private String creditEndDate;// '授信结束日期',
-
+	private String notarizationNo;
+	private Date notarizaitonSignTime;
+	private String authNotarization;
+	
+	private String authNote;
+	private String notaryUserName;
+	private Integer notaryFee;
 }