xuhy
6 天以前 89351ad17c81b37495f21d4dfbf28f0d306a155a
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -132,6 +132,47 @@
                .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();
    }
    /**
     * 通过subscriptionId查询订单详情
     */
    @ApiOperation(value = "订单列表-通过subscriptionId查询订单详情", tags = {"后台-订单管理"})
    @GetMapping(value = "/detailBySubscriptionId")
    public R<Order> detailBySubscriptionId(@RequestParam("subscriptionId")String subscriptionId) {
        // 通过subscriptionId查询订单详情
        Order order = orderService.getOne(Wrappers.lambdaQuery(Order.class)
                    .eq(Order::getSubscriptionId, subscriptionId)
                    .last("LIMIT 1"));
        return R.ok(order);
    }
    @ApiOperation(value = "订单列表-增加打印次数", tags = {"后台-订单管理"})
    @PostMapping(value = "/count")
@@ -329,7 +370,7 @@
     */
    @ApiOperation(value = "订单列表-新增订单", tags = {"后台-订单管理"})
    @PostMapping(value = "/save")
    public R<Boolean> save(@RequestBody OrderRequest orderRequest) {
    public R<String> save(@RequestBody OrderRequest orderRequest) {
        R<BigDecimal> servePrice = userClient.getServePrice(orderRequest.getServeId(), orderRequest.getCityCode());
        if (servePrice.getData()!=null){
@@ -377,7 +418,9 @@
        order.setOrderMoney(orderRequest.getOrderMoney());
        order.setProvinceCode(orderRequest.getProvinceCode());
        order.setAreaCode(orderRequest.getAreaCode());
        return R.ok(orderService.save(order));
        order.setIsOpenVirtualNumber(orderRequest.getIsOpenVirtualNumber());
        orderService.save(order);
        return R.ok(order.getId(),"新增成功");
    }
@@ -744,7 +787,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();
@@ -755,6 +798,7 @@
        order.setCompleteTime(new Date());
        order.setState(Constants.THREE);
        order.setFake(orderSubmitRequest.getFake());
        order.setRemark(orderSubmitRequest.getRemark());
        boolean update = orderService.updateById(order);
        // 服务记录
        ServeRecord serveRecord = new ServeRecord();
@@ -764,7 +808,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();
    }
    /**