20210818

xiaoyong931011

2021-08-18 a8fb0a175ff61c82819e7da191030c2f5e90ae98

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java

@@ -151,12 +151,26 @@
        if(ScoreOrder.STATUS_READY != status){
            return JsonResult.failMessage("当前订单不是待发货状态！");
        }
        ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(model.getId());
        Example exampleDetails = new Example(ScoreDetails.class);
        Example.Criteria criteriaDetails = exampleDetails.createCriteria();
        criteriaDetails.andEqualTo("orderNo",order.getOrderNo());
        criteriaDetails.andEqualTo("userId",order.getUserId());
        criteriaDetails.andEqualTo("type",ScoreDetails.SCORE_TYPE_SHOPPING_RETURN);

        orderService.cancelOrder(id,scoreOrder.getUserId());
        OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
        mqUtil.sendApp(build);
        return  JsonResult.success("操作成功！");
        List<ScoreDetails> scoreDetails = scoreDetailsMapper.selectByExample(exampleDetails);
        if(CollUtil.isNotEmpty(scoreDetails)){
            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("操作失败！");
        }
    }