兼容邮储产品

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

@@ -38,7 +38,6 @@ public class NotaryOrderQueryRsp {
 	private String idCard;
 	// 合同金额
 	private String contractMoney;
-
 	// 所属银行
 	private String bankName;
 	// 客户经理
@@ -47,21 +46,11 @@ public class NotaryOrderQueryRsp {
 	private String bankId;
 	// 自动生成公证书标记
 	private String autoGenerate;
-	
+	// 返回原因
+	private String returnReason;
+	// 驳回原因
+	private String rejectReason;
 	// 创建时间
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime createTime;
-	// 申请时间
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private LocalDateTime applyTime;
-
-	public LocalDateTime getApplyTime() {
-
-		return applyTime = createTime;
-	}
-
-	public void setApplyTime(LocalDateTime applyTime) {
-		this.applyTime = applyTime;
-	}
-
 }

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

@@ -317,16 +317,17 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	@Override
 	public AppBaseResponse orderReturn(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString(), req.getReturnReason());
 		response.success("退回成功");
 		return response;
 	}
 
+	@Override
 	public AppBaseResponse orderReject(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		ContractOrderEntity contractOrderEntity = contractOrderMapper.selectById(req.getId());
+		ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(req.getBusinessNo());
 		bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
 				StatusEnum.NotaryStatusEnum.REJECT.getStatus().toString(), req.getRejectReason());
 		response.success("驳回成功");