20220902

xiaoyong931011

2022-09-08 b88180c05a090c9b8d52d6bc7b94d9a5a2082cf7

20220902

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -81,6 +81,18 @@
    }

    /**
     * 订单列表-删除订单
     *
     * @param id
     * @return
     */
    @GetMapping("delOrder/{id}")
    @ControllerEndpoint(operation = "订单列表-删除订单", exceptionMessage = "操作失败")
    public FebsResponse delOrder(@NotNull(message = "{required}") @PathVariable Long id) {
        return adminMallOrderService.delOrder(id);
    }

    /**
     * 订单退款-列表
     *
     * @param mallOrderRefundDto

 src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java

@@ -66,4 +66,6 @@
    FebsResponse showStateSwitchOn(Long id);

    FebsResponse showStateSwitchOff(Long id);

    FebsResponse delOrder(Long id);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -421,6 +421,20 @@
    }

    @Override
    public FebsResponse delOrder(Long id) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return new FebsResponse().fail().message("订单不存在，请刷新重试");
        }
        Integer status = mallOrderInfo.getStatus();
        if(status != 7){
            return new FebsResponse().fail().message("订单不是已取消状态");
        }
        mallOrderInfoMapper.deleteById(id);
        return new FebsResponse().success();
    }

    @Override
    public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
        if (mallOrderInfo == null) {

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -149,6 +149,11 @@
                    cancelOrder(data.id);
                });
            }
            if (layEvent === 'delOrder') {
                febs.modal.confirm('删除订单', '确认删除订单？', function () {
                    delOrder(data.id);
                });
            }
            if (layEvent === 'seePayImage') {
                var t = $view.find('#seePayImage'+data.id+'');
                //页面层
@@ -168,6 +173,13 @@

        function cancelOrder(id) {
            febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }

        function delOrder(id) {
            febs.get(ctx + 'admin/order/delOrder/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
@@ -233,6 +245,9 @@
                                    if (d.status === 2) {
                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
                                            +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                    }else if(d.status === 7){
                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                            +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delOrder" shiro:hasPermission="user:update">删除</button>'
                                    }else{
                                        return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                    }