8.3

luodangjia

2024-08-03 67157345fe1878681e39ec186ef37ff6b3b5c1fc

 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,14 @@
        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()));
                if (order.getAddress()!=null) {
                    order.setReservationAddress(order.getReservationAddress() + order.getAddress());
                }
            }
        }
        return R.ok(dataList);