销售端无法查看物流消息

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -733,10 +733,11 @@ public class FsStoreOrderScrmController extends BaseController {
     @GetMapping(value = "/getExpress/{id}")
     public R getExpress(@PathVariable("id") Long id) {
         FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        ExpressInfoDTO expressInfoDTO = null;
+        ExpressInfoDTO expressInfoDTO = new ExpressInfoDTO();
         IErpOrderService erpService = getErpService();
         if (erpService == dfOrderService){
-            expressInfoDTO = fsStoreOrderService.getDfExpressInfoDTO(order);
+            com.fs.hisStore.dto.ExpressInfoDTO dto = fsStoreOrderService.getDfExpressInfoDTO(order);
+            BeanUtils.copyProperties(dto,expressInfoDTO);
         } else {
             if (StringUtils.isNotEmpty(order.getDeliveryId())) {
                 String lastFourNumber = "";

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -9,9 +9,9 @@ import com.fs.common.exception.CustomException;
 import com.fs.common.utils.*;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.his.config.FsSysConfig;
-import com.fs.his.dto.ExpressInfoDTO;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.domain.*;
+import com.fs.hisStore.dto.ExpressInfoDTO;
 import com.fs.hisStore.dto.FsStoreOrderComputeDTO;
 import com.fs.hisStore.enums.OrderInfoEnum;
 import com.fs.hisStore.param.*;