xuhy
7 天以前 640d93c464c65a0ef128f7f357a3e9abe44fbd2c
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -132,6 +132,35 @@
                .eq(Order::getId, orderId).set(Order::getState, state).update());
    }
    /**
     * 更改订单虚拟童话绑定id
     */
    @ApiOperation(value = "订单列表-设置虚拟号码绑定id", tags = {"后台-订单管理"})
    @GetMapping(value = "/updateSubscriptionId")
    public R<Boolean> updateSubscriptionId(@RequestParam("orderId") String orderId,
                                           @RequestParam("subscriptionId")String subscriptionId,
                                           @RequestParam("virtualNumber")String virtualNumber) {
        // 修改订单设置绑定id
        orderService.lambdaUpdate().eq(Order::getId, orderId)
                .set(Order::getSubscriptionId, subscriptionId)
                .set(Order::getVirtualNumber, virtualNumber)
                .update();
        return R.ok();
    }
    /**
     * 更改订单虚拟童话录音
     */
    @ApiOperation(value = "订单列表-设置虚拟号码绑定id", tags = {"后台-订单管理"})
    @GetMapping(value = "/updatePhoneRecording")
    public R<Boolean> updatePhoneRecording(@RequestParam("orderId") String orderId,
                                           @RequestParam("audioUrl")String audioUrl) {
        // 修改订单设置绑定id
        orderService.lambdaUpdate().eq(Order::getId, orderId)
                .set(Order::getPhoneRecording, audioUrl)
                .update();
        return R.ok();
    }
    @ApiOperation(value = "订单列表-增加打印次数", tags = {"后台-订单管理"})
    @PostMapping(value = "/count")
@@ -744,7 +773,7 @@
    @ApiOperation(value = "订单完工-提交订单", tags = {"师傅端-订单列表"})
    @PostMapping(value = "/orderSubmit")
    @Transactional(rollbackFor = Exception.class)
    public R<Boolean> orderSubmit(@RequestBody OrderSubmitRequest orderSubmitRequest) {
    public R<String> orderSubmit(@RequestBody OrderSubmitRequest orderSubmitRequest) {
        // 订单信息
        Order order = orderService.lambdaQuery().eq(Order::getId, orderSubmitRequest.getOrderId())
                .eq(Order::getIsDelete, 0).one();
@@ -765,7 +794,10 @@
        serveRecord.setCardPic(orderSubmitRequest.getCardPic());
        serveRecord.setMachinePic(orderSubmitRequest.getMachinePic());
        boolean save = serveRecordService.save(serveRecord);
        return R.ok(update && save);
        if(update && save){
            return R.ok(order.getSubscriptionId(), "订单提交成功!");
        }
        return R.ok();
    }
    /**