司机上报

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java

@@ -3,10 +3,12 @@ package com.clx.performance.service.impl.collect;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.collect.CollectLineReportDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.integral.IntegralRecordEnum;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.*;
@@ -34,6 +36,8 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
     private CollectLineReportDao collectLineReportDao;
     @Autowired
     private OrderChildDao orderChildDao;
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
 
     @Autowired
     private CollectLineReportStruct collectLineReportStruct;
@@ -233,19 +237,18 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();
 
-        OrderChild orderChild = orderChildDao.getByChildNo(param.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(param.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         CollectLineReport collectLineReport = new CollectLineReport();
         collectLineReport.setUserNo(userNo);
         collectLineReport.setName(loginUserInfo.getUserName());
         collectLineReport.setMobile(loginUserInfo.getUserMobile());
-        collectLineReport.setTruckNo(orderChild.getTruckNo());
 
         collectLineReport.setOrderGoodsNo(param.getOrderGoodsNo());
-        collectLineReport.setSendAddressId(orderChild.getSendAddressId());
-        collectLineReport.setSendAddress(orderChild.getSendAddress());
-        collectLineReport.setReceiveAddressId(orderChild.getReceiveAddressId());
-        collectLineReport.setReceiveAddress(orderChild.getReceiveAddress());
+        collectLineReport.setSendAddressId(orderGoods.getSendAddressId());
+        collectLineReport.setSendAddress(orderGoods.getSendAddressShorter());
+        collectLineReport.setReceiveAddressId(orderGoods.getReceiveAddressId());
+        collectLineReport.setReceiveAddress(orderGoods.getReceiveAddressShorter());
 
         collectLineReport.setType(CollectLineReport.Type.SEND.getCode());
         collectLineReport.setReportType(CollectLineReport.ReportType.NO_TAKE_ORDER.getCode());