8.6
luodangjia
2024-08-06 1529842471c8c07a5181a10404b6dff2a0944500
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -270,6 +270,7 @@
//    @RequiresPermissions({"reassignment_edit","order_edit"})
    @ApiOperation(value = "订单列表-编辑", tags = {"后台-订单管理"})
    @PostMapping(value = "/edit")
@@ -278,7 +279,10 @@
        Site site = siteService.lambdaQuery()
                .eq(Site::getId, order.getSiteId())
                .eq(Site::getIsDelete, 0).one();
        order.setSiteName(site.getSiteName());
        if (null != site) {
            order.setSiteName(site.getSiteName());
        }
        // 师傅信息
        if (null != order.getServerId()) {
            MasterWorker masterWorker = masterWorkerService.lambdaQuery()
@@ -299,6 +303,7 @@
        }else {
            order.setOrderMoney(one.getRecoveryPrice());
        }
        order.setServeName(recoveryServe.getServeName());
        // 后台订单
        order.setType(Constants.ONE);
        Boolean data = orderClient.edit(order).getData();
@@ -419,8 +424,8 @@
    @ApiOperation(value = "ocr识别", tags = {"后台-首页"})
    @PostMapping (value = "/ocr")
    public R<AddressDto> ocr(OcrBase ocrBase) {
        return R.ok(DescribeInstances.orcr(ocrBase.getBase()));
    public R<AddressDto> ocr(String ocrAddress) {
        return R.ok(DescribeInstances.ocr(ocrAddress));
    }
    /**