From 063717b4ca1eafe8197ade88094819c224df0b80 Mon Sep 17 00:00:00 2001 From: Hawking Date: Tue, 16 May 2023 22:48:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E9=80=80=E5=8D=95/=E5=95=86?= =?UTF-8?q?=E5=AE=B6=E9=80=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderDetailController.java | 10 ++++++ .../order/OrderMasterController.java | 10 ++++++ .../resources/templates/order/master.html | 35 +++++++++++++------ .../ghy/order/mapper/OrderDetailMapper.java | 2 ++ .../ghy/order/service/OrderDetailService.java | 2 ++ .../ghy/order/service/OrderMasterService.java | 3 ++ .../service/impl/OrderDetailServiceImpl.java | 5 +++ .../service/impl/OrderMasterServiceImpl.java | 13 +++++++ .../mapper/order/OrderDetailMapper.xml | 4 +++ 9 files changed, 74 insertions(+), 10 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 1c6c41b0..57f03ffc 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -823,6 +823,16 @@ public class OrderDetailController extends BaseController { return AjaxResult.success("发起成功"); } + /** + * 拒绝订单 + * 后台管理系统使用，可控制权限 + */ + @PostMapping("/reject") + @ResponseBody + public AjaxResult reject(OrderDetail orderDetail) { + return rejectDetailOrder(orderDetail); + } + /** * 拒绝订单 */ diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 60560d4a..1e67e336 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -815,4 +815,14 @@ public class OrderMasterController extends BaseController { return true; } + /** + * 拒绝订单 + * 后台管理系统使用，可控制权限 + */ + @PostMapping("/reject") + @ResponseBody + public AjaxResult reject(OrderMaster orderMaster) { + int i = orderMasterService.reject(orderMaster); + return AjaxResult.success(i); + } } diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index e7a634f5..0dc9766c 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -132,6 +132,17 @@ + '接单时间：' + row.revTime + ''; } }, + { + title: '操作', + align: 'left', + formatter: function (value, row, index) { + var actions = []; + actions.push('查看 '); + actions.push('师傅退单 '); + actions.push('商家退单 '); + return actions.join(''); + } + }, { field: 'goodsWorker', title: '商家信息', @@ -144,16 +155,6 @@ field: 'changeMoney', title: '商家追加金额', align: 'center' - }, - { - title: '操作', - align: 'left' - // formatter: function (value, row, index) { - // var actions = []; - // actions.push('详情 '); - // return actions.join(''); - // } },{ field: 'orderType', title: '订单类型', @@ -190,6 +191,20 @@ var url = "order/goods?orderId=" + id; $.modal.open("商品信息", url); } + function orderDetailReject(id) { + $.modal.confirm("确定要退单吗？", function() { + const url = "detail/reject"; + const data = { "id": id }; + $.operate.post(url, data); + }); + } + function orderMasterReject(id) { + $.modal.confirm("确定要退单吗？", function() { + const url = "master/reject"; + const data = { "id": id }; + $.operate.post(url, data); + }); + } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java index 86f88ff0..8f964968 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java @@ -110,4 +110,6 @@ public interface OrderDetailMapper { * @return 1 */ int updateDrawCashStatus(@Param("drawCashId") String drawCashId, @Param("drawCashStatus") int drawCashStatus, @Param("arrivalTime") Date arrivalTime); + + int deleteByMaster(Long masterId); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java index 33d88550..bdf164be 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java @@ -173,4 +173,6 @@ public interface OrderDetailService { * @return 1 */ int updateTimeout(Long id, int timeout, int timeoutFineTimes); + + int deleteByMaster(Long masterId); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index 7e12b7b1..edc62dab 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -1,5 +1,6 @@ package com.ghy.order.service; +import com.ghy.common.core.domain.AjaxResult; import com.ghy.order.domain.OrderMaster; import com.ghy.order.request.AppOrderRequest; import com.huifu.adapay.core.exception.BaseAdaPayException; @@ -162,4 +163,6 @@ public interface OrderMasterService { * @return 1 */ int removeWorker(Long id); + + int reject(OrderMaster orderMaster); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 112d039b..98471aed 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -769,4 +769,9 @@ public class OrderDetailServiceImpl implements OrderDetailService { public int updateTimeout(Long id, int timeout, int timeoutFineTimes) { return orderDetailMapper.updateTimeout(id, timeout, timeoutFineTimes); } + + @Override + public int deleteByMaster(Long masterId) { + return orderDetailMapper.deleteByMaster(masterId); + } } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 099074a8..a1c8b460 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -518,4 +518,17 @@ public class OrderMasterServiceImpl implements OrderMasterService { public int removeWorker(Long id) { return orderMasterMapper.removeWorker(id); } + + @Override + @Transactional(rollbackFor = Exception.class) + public int reject(OrderMaster orderMaster) { + // 删主单的 workerId + int i1 = orderMasterMapper.removeWorker(orderMaster.getId()); + // 删子单对应的 OrderGoods + List orderDetails = orderDetailService.selectByOrderMasterId(orderMaster.getId()); + orderDetails.forEach(x -> orderGoodsService.deleteByOrderDetailId(x.getId())); + // 删子单 + orderDetailService.deleteByMaster(orderMaster.getId()); + return 1; + } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index a8ec99a2..282fd4e7 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -262,6 +262,10 @@ + + DELETE FROM order_detail WHERE order_master_id = #{masterId} + + UPDATE order_detail