From b7afd45a5510bb328ee4e0c2b06b909140bc4a97 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 三月 2022 12:51:27 +0800
Subject: [PATCH] #杰克缝纫机立库 【手动删除订单】 - java
---
src/main/java/com/zy/asrs/controller/OrderController.java | 11 ++++++++---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 6 +++++-
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 7 +++++++
src/main/webapp/static/js/order/order.js | 10 ++++------
4 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 93a9a57..2ada0f8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -43,6 +43,7 @@
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
wrapper.orderBy("create_time", false);
}
+ wrapper.eq("status", 1);
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -184,9 +185,13 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- orderService.deleteById(id);
+ public R delete(@RequestParam Long orderId){
+ Order order = orderService.selectById(orderId);
+ if (order != null) {
+ order.setStatus(0);
+ }
+ if (!orderService.updateById(order)) {
+ throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index e169f39..7abf9ef 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -1,8 +1,12 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.OrderDetl;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.OrderDetl;
+
+import java.util.List;
public interface OrderDetlService extends IService<OrderDetl> {
+ List<OrderDetl> selectByOrderId(Long orderId);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 414b701..cb3ccb5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,12 +1,19 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("orderDetlService")
public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
+ @Override
+ public List<OrderDetl> selectByOrderId(Long orderId) {
+ return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+ }
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 5cd8afc..a8b8197 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -66,7 +66,7 @@
if (layEvent === 'edit') {
showEditModel(data);
} else if (layEvent === 'del') {
- doDel(data.billNo);
+ doDel(data.id);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -402,21 +402,19 @@
}
// 鍒犻櫎鍗曟嵁
- function doDel(billNo) {
+ function doDel(orderId) {
layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
shade: .1,
skin: 'layui-layer-admin'
}, function (i) {
layer.close(i);
layer.load(2);
-
$.ajax({
- url: baseUrl+"/waitMatin/delete/auth",
+ url: baseUrl+"/order/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- billNo: billNo
+ orderId: orderId
},
- // contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
layer.closeAll('loading');
--
Gitblit v1.9.1