20210926

xiaoyong931011

2021-09-26 9f03ae0b6bab4f2bb0abbe40ec66abd1d1ae87c4

20210926

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

@@ -55,6 +55,17 @@
    }

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

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

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

@@ -52,4 +52,6 @@
    AdminMallPayMethodEditVo getMallPayMethodEditInfoById(long id);

    FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto);

    FebsResponse cancelOrder(Long id);
}

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

@@ -100,8 +100,11 @@
        if(ObjectUtil.isEmpty(mallMoneyFlow)){
            return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
        }
        if(1 != mallMoneyFlow.getStatus()){
            return new FebsResponse().fail().message("当前状态不是提现中");
        }
        mallMoneyFlow.setStatus(2);
        mallMoneyFlowMapper.insert(mallMoneyFlow);
        mallMoneyFlowMapper.updateById(mallMoneyFlow);
        return new FebsResponse().success();
    }

@@ -112,8 +115,11 @@
        if(ObjectUtil.isEmpty(mallMoneyFlow)){
            return new FebsResponse().fail().message("系统繁忙，请刷新后重试");
        }
        if(1 != mallMoneyFlow.getStatus()){
            return new FebsResponse().fail().message("当前状态不是提现中");
        }
        mallMoneyFlow.setStatus(3);
        mallMoneyFlowMapper.insert(mallMoneyFlow);
        mallMoneyFlowMapper.updateById(mallMoneyFlow);
        return new FebsResponse().success();
    }


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

@@ -313,5 +313,20 @@
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse cancelOrder(Long id) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return new FebsResponse().fail().message("系统繁忙，请刷新重试");
        }
        Integer status = mallOrderInfo.getStatus();
        if(status != 2){
            return new FebsResponse().fail().message("订单不是代发货状态");
        }
        mallOrderInfo.setStatus(7);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        return new FebsResponse().success();
    }


}

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

@@ -120,7 +120,11 @@
                    maxmin: true,
                });
            }

            if (layEvent === 'cancelOrder') {
                febs.modal.confirm('取消订单', '确认取消订单？', function () {
                    cancelOrder(data.id);
                });
            }
            if (layEvent === 'seePayImage') {
                var t = $view.find('#seePayImage'+data.id+'');
                //页面层
@@ -137,6 +141,13 @@
                });
            }
        });

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

        // 查询按钮
        $query.on('click', function () {
@@ -195,12 +206,22 @@
                            }, minWidth: 80,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                             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{
                                 return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                             }
                            if(d.payMethod === '支付宝支付' || d.payMethod === '微信支付'){
                                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="cancelOrder" shiro:hasPermission="user:update">取消订单</button>'
                                        +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" 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>'
                                }
                            }else{
                                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{
                                    return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
                                }
                            }
                        },minWidth: 300,align:'center'}
                ]]
            });