From 4172b0bdc098d4a8055bdb0b1bfb4cbf866e47a0 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期一, 24 六月 2024 10:09:51 +0800
Subject: [PATCH] 响应
---
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index 5497118..cbeb807 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -82,7 +82,7 @@
public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo)
{
QueryWrapper<EnforceOrder> qw = getQw(bo);
- qw.ge("order_status",2);
+ qw.ge("order_status",4);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
}
@@ -305,6 +305,9 @@
public Boolean doScanOrder(Long orderId)
{
EnforceOrder order = this.getById(orderId);
+ if (order.getOrderStatus()!=2){
+ throw new BaseException("鎵ф硶鍗曡繕鏈鎵癸紒");
+ }
order.setOrderStatus(3);
SysUser user = SecurityUtils.getLoginUser().getUser();
order.setExecuteId(user.getUserId());
@@ -326,7 +329,6 @@
if (StringUtils.isEmpty(resultBo.getRegionReason())){
throw new BaseException("璇峰～鍐欐墽娉曠粨鏋滆鏄�");
}
-
return this.update(lu()
.set(resultBo.getRegionStatus()!=null, EnforceOrder::getRegionStatus, resultBo.getRegionStatus())
.set(StringUtils.isNotEmpty(resultBo.getRegionReason()), EnforceOrder::getRegionReason, resultBo.getRegionReason())
@@ -351,6 +353,9 @@
throw new BaseException("璇峰～鍐欐姇璇夊唴瀹癸紒");
}
EnforceOrder order = this.getById(bo.getOrderId());
+ if (order.getOrderStatus()!=4){
+ throw new BaseException("鎵ф硶鍗曟湭涓婃姤鎵ф硶缁撴灉锛�");
+ }
//娣诲姞鎶曡瘔璁板綍
EnforceComplaintLogBo complaintLogBo = Convert.convert(EnforceComplaintLogBo.class, order);
complaintLogBo.setComplaintType(bo.getComplaintType());
--
Gitblit v1.9.1