From f6a1bf1d9b19dd8b3750034048f3876d086db1f1 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 14 八月 2024 17:11:49 +0800
Subject: [PATCH] 企业二维码添加
---
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index 81c4995..80bf645 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -53,7 +53,7 @@
.ne(SysUser::getUserType,"02")
.ne(SysUser::getUserName,"admin")
.ne(SysUser::getUserId, SecurityUtils.getUserId())
- .eq(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
+ .like(StringUtils.isNotEmpty(nickName), SysUser::getNickName,nickName)
.eq(deptId!=null, SysUser::getDeptId,deptId)
);
list.forEach(user->{
@@ -141,7 +141,7 @@
@PostMapping("/doScanOrder/{orderId}")
public AjaxResult doScanOrder(@PathVariable("orderId") Long orderId)
{
- return AjaxResult.success(iEnforceOrderService.doScanOrder(orderId));
+ return toAjax(iEnforceOrderService.doScanOrder(orderId));
}
@ApiOperation("涓婃姤缁撴灉")
@@ -166,7 +166,7 @@
@PostMapping("/orderComplaint")
public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
{
- return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
+ return toAjax(iEnforceOrderService.orderComplaint(bo));
}
@ApiOperation("鎵ф硶鍗曟姇璇夎妭鐐�")
@@ -230,4 +230,15 @@
{
return toAjax(iEnforceOrderService.deleteByIds(Arrays.asList(orderIds)) ? 1 : 0);
}
+
+
+ @ApiOperation("浼佷笟纭鈥斺�旀墽娉曞崟")
+ //@PreAuthorize("@ss.hasPermi('enforce:order:remove')")
+ @Log(title = "浼佷笟纭鎵ф硶鍗�" , businessType = BusinessType.UPDATE)
+ @PostMapping("/confirm/{orderId}")
+ @RepeatSubmit
+ public AjaxResult remove(@PathVariable Long orderId)
+ {
+ return toAjax(iEnforceOrderService.confirm(orderId) ? 1 : 0);
+ }
}
--
Gitblit v1.9.1