|
@@ -26,6 +26,7 @@ import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
|
|
|
import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
|
|
|
import com.fjhx.victoriatourist.utils.Assert;
|
|
|
import com.fjhx.victoriatourist.utils.LogisticsConstant;
|
|
|
+import com.fjhx.wms.entity.stock.vo.StockVo;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.event.EventListener;
|
|
@@ -69,7 +70,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
|
|
|
Page<LogisticsInfosVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
List<LogisticsInfosVo> records = page.getRecords();
|
|
|
//赋值物流公司名字
|
|
|
- List<String> codes = records.stream().map(LogisticsInfosVo::getCode).collect(Collectors.toList());
|
|
|
+ List<String> codes = records.stream().map(LogisticsInfosVo::getLogisticsCompanyCode).collect(Collectors.toList());
|
|
|
if (ObjectUtil.isEmpty(codes)) {
|
|
|
return page;
|
|
|
}
|