物流轨迹查询3

ch-core/src/main/java/com/wwdz/ch/core/entity/LogisticsInfo.java

@@ -17,5 +17,18 @@ public class LogisticsInfo implements Entity {
 
     private String stateName;
 
+    /**
+     * 物流信息
+     */
     private List<TrailInfo> trailInfoList;
+
+    /**
+     * 收货信息
+     */
+    private String receiverInfo;
+
+    /**
+     * 订单号
+     */
+    private String distributionOrderId;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -47,7 +47,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 						"/wx/supplierItem/findItemsOfCurrentDistributor", "/wx/selfPage/updateSwitch", "/wx/supplierItem/findHomePage"
 						//下列路径上线注释
 
-					/*	, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
+						/*, "/wx/supplierItem/**", "/wx/shareRecord/**", "/wx/distributionOrder/**", "/wx/selfPage/**", "/wx/auctionRecord/**",
 						"/wx/shareRecord/**","/wx/collectionBook/**", "/wx/collectedRecord/**", "/wx/collectionItemsRelation/**","/wx/collectionShareRecord/**"
 						,"/wx/logistics/**"
 						*/

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

 package com.wwdz.ch.wx.impl.distribution;
 
+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.distribution.DistributionOrderDao;
@@ -32,7 +33,16 @@ public class LogisticsServiceImpl implements LogisticsService {
                     LogisticsRequestDto logisticsRequestDto = new LogisticsRequestDto();
                     logisticsRequestDto.setLogisticsCode(distributionOrder.getLogisticsCode());
                     logisticsRequestDto.setWaybill(distributionOrder.getWaybill());
-                    return logisticsApi.findTrails(logisticsRequestDto);
+                    Result result = logisticsApi.findTrails(logisticsRequestDto);
+                    if (result.getSuccess()) {
+                        LogisticsInfo logisticsInfo = (LogisticsInfo) result.getData();
+                        String receiverInfo = distributionOrder.getReceiverName() + "," + distributionOrder.getReceiverPhone() + "," + distributionOrder.getReceiverAddress();
+                        logisticsInfo.setReceiverInfo(receiverInfo);
+                        logisticsInfo.setDistributionOrderId(orderId);
+                        result.setData(logisticsInfo);
+                        return result;
+                    }
+                    return result;
                 } else {
                     return Result.failed("承运商信息为空");
                 }