查询物流

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/LogisticsServiceImpl.java

@@ -2,14 +2,17 @@ package com.wwdz.ch.wx.impl.distribution;
 
 import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.CommonEnum;
+import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.entity.LogisticsInfo;
 import com.wwdz.ch.core.entity.LogisticsRequestDto;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.CollectorWhiteListDao;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
+import com.wwdz.ch.db.dao.distribution.ExchangeOrderSnapshotDao;
 import com.wwdz.ch.db.dao.distribution.IdentifyOrderDao;
 import com.wwdz.ch.db.domain.CollectorWhiteList;
 import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.domain.distribution.ExchangeOrderSnapshot;
 import com.wwdz.ch.db.domain.distribution.IdentifyOrder;
 import com.wwdz.ch.core.api.LogisticsApi;
 import com.wwdz.ch.wx.service.distribution.LogisticsService;
@@ -18,6 +21,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
 
 @Service
 public class LogisticsServiceImpl implements LogisticsService {
@@ -36,6 +42,9 @@ public class LogisticsServiceImpl implements LogisticsService {
     @Autowired
     CollectorWhiteListDao collectorWhiteListDao;
 
+    @Autowired
+    ExchangeOrderSnapshotDao exchangeOrderSnapshotDao;
+
     @Override
     public Result findLogisticsInfo(String orderId) {
         try {
@@ -71,16 +80,25 @@ public class LogisticsServiceImpl implements LogisticsService {
     @Override
     public Result findLogisticsInfo(LogisticsRequestDto dto) {
         try {
+            DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
             int type = dto.getType();
             String logisticsCode = null;
             String waybill = null;
             String receiverInfo = null;
             LogisticsRequestDto logisticsRequestDto = new LogisticsRequestDto();
             if (type == CommonEnum.LogisticsTypeEnum.FROM.getCode()) {
+                //以物换物的订单，用户发货的快递信息在订单快照表中
+                if (DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode() == distributionOrder.getType().intValue()) {
+                    List<ExchangeOrderSnapshot> exchangeOrderSnapshotList = exchangeOrderSnapshotDao.findByOrderId(dto.getDistributionOrderId());
+                    if (!CollectionUtils.isEmpty(exchangeOrderSnapshotList)) {
+                        logisticsCode = exchangeOrderSnapshotList.get(0).getLogisticsCode();
+                        waybill = exchangeOrderSnapshotList.get(0).getWaybill();
+                        receiverInfo = CommConsts.SYSTEM_DEFAULT_ADDRESS;
+                    }
+                } else {
                     IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
                     logisticsCode = identifyOrder.getFromLogisticsCode();
                     waybill = identifyOrder.getFromWaybill();
-                DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
                     //查询藏家是否具有直接发货给买家的权限
                     CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findById(distributionOrder.getSellerId());
                     if (collectorWhiteList != null && 1 == collectorWhiteList.getDeliveryAuth()) {
@@ -88,9 +106,9 @@ public class LogisticsServiceImpl implements LogisticsService {
                     } else {
                         receiverInfo = CommConsts.SYSTEM_DEFAULT_ADDRESS;
                     }
+                }
                 logisticsRequestDto.setReceiverPhone(distributionOrder.getReceiverPhone());
             } else if (type == CommonEnum.LogisticsTypeEnum.DELIVERY.getCode()) {
-                DistributionOrder distributionOrder = distributionOrderDao.findById(dto.getDistributionOrderId());
                 logisticsCode = distributionOrder.getLogisticsCode();
                 waybill = distributionOrder.getWaybill();
                 receiverInfo = distributionOrder.getReceiverName() + "," + distributionOrder.getReceiverPhone() + "," + distributionOrder.getReceiverAddress();