feat: 最新代码及配置

hjl

2024-07-26 f8cc44e926fd22f9d1d864dc684c827f6960270b

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java

@@ -16,7 +16,6 @@
import com.ruoyi.admin.vo.*;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.order.api.entity.ServeRecord;
import com.ruoyi.order.api.feignClient.EvaluateClient;
import com.ruoyi.order.api.feignClient.OrderClient;
@@ -174,43 +173,45 @@

    private void workerInfo(OrderDetailVO result, com.ruoyi.order.api.entity.Order order) {
        MasterWorker worker = masterWorkerService.getById(order.getServerId());
        OrderByWorkerVO orderByWorker = new OrderByWorkerVO();
        if (null != worker) {
            OrderByWorkerVO orderByWorker = new OrderByWorkerVO();
            orderByWorker.setProfilePicture(worker.getProfilePicture());
            orderByWorker.setName(worker.getRealName());
            orderByWorker.setPhone(worker.getPhone());
            orderByWorker.setSex(worker.getSex());
            result.setWorkerInfo(orderByWorker);
        } else {
            orderByWorker.setName(order.getServerName());
            orderByWorker.setPhone(order.getServerPhone());
        }
        result.setWorkerInfo(orderByWorker);
    }

    private void serveInfo(OrderDetailVO result, com.ruoyi.order.api.entity.Order order) {
        RecoveryServe recoveryServe = recoveryServeService.getById(order.getServeId());
        if (null == recoveryServe) {
            throw new GlobalException("回收服务信息异常，请重试");
        }
        RecoveryClassify recoveryClassify = recoveryClassifyService.getById(recoveryServe.getClassifyId());
        if (null == recoveryClassify) {
            throw new GlobalException("回收服务分类信息异常，请重试");
        }
        OrderByServeVO orderByServe = new OrderByServeVO();
        orderByServe.setServeName(recoveryServe.getServeName());
        orderByServe.setCover(recoveryServe.getCover());
        orderByServe.setSupClassify(recoveryClassify.getSupClassify());
        orderByServe.setSubClassify(recoveryClassify.getSubClassify());
        if (null != recoveryServe) {
            RecoveryClassify recoveryClassify = recoveryClassifyService.getById(recoveryServe.getClassifyId());
            orderByServe.setServeName(recoveryServe.getServeName());
            orderByServe.setCover(recoveryServe.getCover());
            if (null != recoveryClassify) {
                orderByServe.setSupClassify(recoveryClassify.getSupClassify());
                orderByServe.setSubClassify(recoveryClassify.getSubClassify());
            }
        } else {
            orderByServe.setServeName(order.getServeName());
        }
        orderByServe.setPrice(order.getServePrice());
        result.setServeInfo(orderByServe);
    }

    private void orderInfo(OrderDetailVO result, com.ruoyi.order.api.entity.Order order) {
        if (null == order) {
            throw new GlobalException("订单信息异常，请重试");
        }
        // 订单信息
        OrderInfoVO orderInfo = new OrderInfoVO();
        orderInfo.setOrderNumber(order.getOrderNumber());
        orderInfo.setPlaceOrderTime(order.getCreateTime());
        orderInfo.setState(order.getState());
        if (null != order) {
            orderInfo.setOrderNumber(order.getOrderNumber());
            orderInfo.setPlaceOrderTime(order.getCreateTime());
            orderInfo.setState(order.getState());
        }
        result.setOrderInfo(orderInfo);
    }

@@ -224,7 +225,7 @@
        }
        orderByUserInfo.setReservationName(order.getReservationName());
        orderByUserInfo.setReservationPhone(order.getReservationPhone());
        orderByUserInfo.setReservationAddress(order.getReservationAddress());
        orderByUserInfo.setReservationAddress(order.getReservationAddress() + order.getAddress());
        orderByUserInfo.setTime(order.getTime());
        result.setUserInfo(orderByUserInfo);
    }