feat: 最新代码及配置

hjl

2024-07-26 f8cc44e926fd22f9d1d864dc684c827f6960270b

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

@@ -18,7 +18,7 @@
import com.ruoyi.system.api.model.LoginUserInfo;
import com.ruoyi.worker.entity.MasterWorker;
import com.ruoyi.worker.entity.RecoveryServe;
import com.ruoyi.worker.entity.ServeCoordinate;
import com.ruoyi.worker.vo.ServeCoordinate;
import com.ruoyi.worker.service.MasterWorkerService;
import com.ruoyi.worker.service.RecoveryServeService;
import io.swagger.annotations.Api;
@@ -92,11 +92,12 @@
        List<Integer> ids = orderList.stream().map(Order::getServeId).collect(Collectors.toList());
        if (!ids.isEmpty()) {
            List<RecoveryServe> serveList = recoveryServeService.lambdaQuery()
                    .in(RecoveryServe::getId, ids).eq(RecoveryServe::getIsDelete, 0).list();
                    .in(RecoveryServe::getId, ids).list();
            Map<Integer, String> map = serveList.stream().collect(Collectors.toMap(RecoveryServe::getId,
                    mw -> Optional.ofNullable(mw.getCover()).orElse("")));
            for (Order order : orderList) {
                order.setCover(map.get(order.getServeId()));
                order.setReservationAddress(order.getReservationAddress() + order.getAddress());
            }
        }
        return R.ok(dataList);
@@ -134,7 +135,7 @@
        changeDispatch.setWorkerName(masterWorker.getRealName());
        changeDispatch.setApplyReason(reason);
        changeDispatch.setApplyTime(DateUtils.getNowDate());
        changeDispatch.setState(0);
        changeDispatch.setState(Constants.ZERO);
        Boolean result = orderClient.changeOrderState(orderId, Constants.SIX).getData();
        Order order = orderClient.detail(orderId).getData();
        if (null == order) {
@@ -178,7 +179,7 @@
        // 上传时判断是否在下单位置附件，距离大于某个值则 不允许上传
        if (distance > Constants.THREE_THOUSAND) {
//            throw new GlobalException("您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
            return R.fail(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
            return R.ok(Boolean.FALSE, "您当前手机定位超出当前订单预约地址范围 3km，无法提供回收服务！");
        }
        return R.ok(true);
    }
@@ -245,7 +246,9 @@
        Integer serveId = data.getOrderInfo().getServeId();
        RecoveryServe recoveryServe = recoveryServeService.lambdaQuery()
                .eq(RecoveryServe::getId, serveId).one();
        data.getOrderInfo().setCover(recoveryServe.getCover());
        if (null != recoveryServe) {
            data.getOrderInfo().setCover(recoveryServe.getCover());
        }
        return R.ok(data);
    }