Merge branch 'branch-nt-1.0.0' into branch-nt-1.0.1

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

@@ -9,8 +9,10 @@ import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.application.admin.service.AdminOrderService;
 import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.AppResultData;
+import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.base.util.TencentServiceUtil;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -87,7 +89,17 @@ public class AdminOrderController {
 		response.setResult(orderDetail);
 		return response;
 	}
-
+	   /**
+		 * 删除订单
+		 *
+		 * @param json
+		 * @return
+		 */
+	@RequestMapping("/delete")
+	public ResponseDTO<String> delete(@RequestBody NotaryOrderQueryReq req) {
+		adminOrderService.updateStatus(req);
+	    return ResponseDTO.success();
+	}
 	/**
 	 * 公证订单 查询 当事人
 	 *

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

@@ -2,8 +2,6 @@ package me.zhengjie.application.admin.service;
 
 import me.zhengjie.application.admin.controller.vo.*;
 import me.zhengjie.base.AppBaseResponse;
-import me.zhengjie.application.admin.controller.vo.FileVo;
-import me.zhengjie.application.admin.controller.vo.OrderDetailDto;
 import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
@@ -64,4 +62,6 @@ public interface AdminOrderService {
     Map<String, FileInfoEntity> getUploadFile(String businessNo);
 
 	OrderDetailDto getOrderDetail(String businessNo);
+	
+	public void updateStatus(NotaryOrderQueryReq req);
 }

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

@@ -344,7 +344,13 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		smsTemplateService.auditBack(req.getBusinessNo());
 		return response;
 	}
-
+	@Override
+	public void updateStatus(NotaryOrderQueryReq req) {
+		String status=StatusEnum.NotaryStatusEnum.DELETE.getStatus().toString();
+		bankOrderService.updateStatus(req.getBusinessNo(),status, null);
+	
+		
+	}
 	@Override
 	public AppBaseResponse orderReject(NotaryOrderQueryReq req) {
 		AppBaseResponse response = new AppBaseResponse();

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

@@ -9,6 +9,7 @@ import me.zhengjie.application.bank.service.BankOrderService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.DateUtils;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.domain.order.OrderConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -106,7 +107,20 @@ public class BankOrderController extends BaseController {
         String businessNo = jsonObj.getString("businessNo");
         return bankOrderService.submitContractOrder(businessNo, getCurrentUser());
     }
-
+    /**
+	 * 删除订单
+	 *
+	 * @param json
+	 * @return
+	 */
+	@RequestMapping("/delete")
+	public ResponseDTO<String> delete(@RequestBody String json) {
+	    JSONObject jsonObj = JSONObject.parseObject(json);
+	    String businessNo = jsonObj.getString("businessNo");
+	    String status= StatusEnum.NotaryStatusEnum.DELETE.getStatus().toString();
+	    bankOrderService.updateStatus(businessNo,status,null);
+	    return ResponseDTO.success();
+	}
     /**
      * 银行合同OCR解析输入
      *

eladmin-system/src/main/java/me/zhengjie/base/util/StatusEnum.java

@@ -116,12 +116,14 @@ public class StatusEnum {
 
     //公证状态
     public enum NotaryStatusEnum {
-    	//  '0.待提交 1.待公证 2待审核 3已签发 4已驳回'
+    	// '0.待提交 1.待公证 2待审核 3已签发 4已驳回' -1.删除 
+    	DELETE(-1, "已删除"),
         SUBMIT(0, "待提交"),
         VERIFY(1, "待审核"),
         NOTARIZED(2,"待公证"),
         PASS(3, "已签发"),
         REJECT(4, "已驳回"),
+    	
        ;
 
         private Integer status;

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

@@ -159,6 +159,7 @@ public class ContractOrderRepository {
         if (!StringUtils.isEmpty(contractNo)) {
             qw.like("contract_no", contractNo);
         }
+        qw.orderByDesc("create_time");
         page = contractOrderMapper.selectPage(page, qw);
         return page.getRecords();
     }