xiaoyong931011
2021-06-25 c4dcdec3c5419bffdf98a021cac170a5cec2e114
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -79,7 +79,7 @@
        }
        Integer status = scoreOrder.getStatus();
        if(ScoreOrder.STATUS_READY != status){
            return JsonResult.failMessage("当前订单不是代发货状态!");
            return JsonResult.failMessage("当前订单不是待发货状态!");
        }
        String expressCom = model.getExpressCom();
        if(StrUtil.isEmpty(expressCom)){
@@ -130,6 +130,32 @@
        }
    }
    /**
     * 取消
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/cancelOrder.json")
    @ApiOperation(value="订单管理-取消", notes="test: 仅0有正确返回")
    public JsonResult cancelOrder(@RequestBody CancelOrderDto model, HttpServletRequest request) {
        long id = model.getId();
        ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
        if(ObjectUtil.isEmpty(scoreOrder)){
            return JsonResult.failMessage("订单不存在!");
        }
        Integer status = scoreOrder.getStatus();
        if(ScoreOrder.STATUS_READY != status){
            return JsonResult.failMessage("当前订单不是待发货状态!");
        }
        Long aLong = orderService.cancelOrder(model);
        if(aLong > 0){
            OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
            mqUtil.sendApp(build);
            return  JsonResult.success("操作成功!");
        }else{
            return  JsonResult.success("操作失败!");
        }
    }
}