Commit e45b4234 authored by lining's avatar lining

fix: 错误的import删除

parent f1001688
...@@ -10,6 +10,7 @@ import com.onsiteservice.core.result.Result; ...@@ -10,6 +10,7 @@ import com.onsiteservice.core.result.Result;
import com.onsiteservice.core.result.ResultGenerator; import com.onsiteservice.core.result.ResultGenerator;
import com.onsiteservice.dao.common.AbstractMapper; import com.onsiteservice.dao.common.AbstractMapper;
import com.onsiteservice.dao.common.page.PageInfoVO; import com.onsiteservice.dao.common.page.PageInfoVO;
import com.onsiteservice.dao.component.RecordComponent;
import com.onsiteservice.dao.mapper.service.*; import com.onsiteservice.dao.mapper.service.*;
import com.onsiteservice.dao.mapper.user.UserMapper; import com.onsiteservice.dao.mapper.user.UserMapper;
import com.onsiteservice.entity.address.ServiceAddress; import com.onsiteservice.entity.address.ServiceAddress;
...@@ -23,14 +24,11 @@ import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderLogVO; ...@@ -23,14 +24,11 @@ import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderLogVO;
import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderVO; import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderVO;
import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper; import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper;
import com.onsiteservice.util.AttrCopyUtils; import com.onsiteservice.util.AttrCopyUtils;
import com.onsiteservice.util.ListUtils;
import com.onsiteservice.util.RandomUtils; import com.onsiteservice.util.RandomUtils;
import com.onsiteservice.util.aliyun.SmsUtils; import com.onsiteservice.util.aliyun.SmsUtils;
import com.onsiteservice.dao.component.RecordComponent;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -562,7 +560,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -562,7 +560,7 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
} }
private List<ServiceOrderVO> buildServiceOrderVO(List<ServiceOrder> serviceOrderList){ private List<ServiceOrderVO> buildServiceOrderVO(List<ServiceOrder> serviceOrderList) {
// 地址信息 // 地址信息
List<Long> addressIdList = serviceOrderList.parallelStream().map(ServiceOrder::getAddressId).collect(Collectors.toList()); List<Long> addressIdList = serviceOrderList.parallelStream().map(ServiceOrder::getAddressId).collect(Collectors.toList());
List<ServiceAddress> serviceAddressList = serviceAddressMapper.selectByIdList(addressIdList); List<ServiceAddress> serviceAddressList = serviceAddressMapper.selectByIdList(addressIdList);
...@@ -585,8 +583,5 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> { ...@@ -585,8 +583,5 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment