Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 8063ee7eee51bfe25a09428e6efc60f828b270c6

 framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPackageServiceImpl.java

@@ -1,5 +1,6 @@
package cn.lili.modules.order.order.serviceimpl;

import cn.hutool.core.util.ArrayUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
@@ -8,9 +9,11 @@
import cn.lili.modules.order.order.mapper.OrderPackageMapper;
import cn.lili.modules.order.order.service.OrderPackageItemService;
import cn.lili.modules.order.order.service.OrderPackageService;
import cn.lili.modules.system.entity.dos.Logistics;
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.modules.system.service.LogisticsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,8 +57,16 @@
            orderPackageVO.setOrderPackageItemList(orderPackageItemList);
            String str = orderPackage.getConsigneeMobile();
            str = str.substring(str.length() - 4);
//            Traces traces = logisticsService.getLogisticTrack(orderPackage.getLogisticsCode(), orderPackage.getLogisticsNo(), str);
//            orderPackageVO.setTraces(traces);
            //不需要取是否打开的可能存在现在不发送快递需要查询物流信息
            List<Logistics> list = logisticsService.list(Wrappers.<Logistics>lambdaQuery()
                    .eq(Logistics::getCode,
                            orderPackage.getLogisticsCode()));
            String logisticsId = orderPackage.getLogisticsCode();
            if (ArrayUtil.isNotEmpty(list)) {
                logisticsId = list.get(0).getId();
            }
            Traces traces = logisticsService.getLogisticTrack(logisticsId, orderPackage.getLogisticsNo(), str);
            orderPackageVO.setTraces(traces);
            orderPackageVOS.add(orderPackageVO);
        });