Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...

无关风月

2025-04-22 0cbb1c4bc98c29e5ca73961d040a0ec1ca4333ac

Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -480,7 +480,7 @@
//            result = dispatchClient.saveRecord(changeDispatch).getData();
        }else {
            orderClient.updateArrivalTime(order.getId(),orderReasinDto.getArriveTime());

            orderClient.updateState(order.getId(), 7);
        }
        ChannelHandlerContext context = NettyChannelMap.getData(String.valueOf(orderReasinDto.getWorkerId()));
        if (null != context) {

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RecoveryServeController.java

@@ -181,7 +181,6 @@
    public R<String> update(@RequestBody RecoveryServeRequest recoveryServeRequest) {
        RecoveryServe serve = recoveryServeRequest.getServe();
        serve.setId(recoveryServeRequest.getId());
        serve.setRecycleSubsidy(recoveryServeRequest.getRecycleSubsidy());
        boolean update = recoveryServeService.updateById(serve);
        // 城市及对应回收价
        List<RecoveryServePrice> priceList = recoveryServePriceService.lambdaQuery()

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java

@@ -64,6 +64,7 @@
        recoveryServe.setSort(getSort());
        recoveryServe.setCover(getCover());
        recoveryServe.setRotate(getRotate());
        recoveryServe.setRecycleSubsidy(getRecycleSubsidy());
        return recoveryServe;
    }