新增货主app运单详情接口

performance-web/src/main/java/com/clx/performance/controller/app/owner/AppOwnerOrderChildController.java

@@ -3,8 +3,10 @@ package com.clx.performance.controller.app.owner;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.owner.PageOwnerOrderChildListParam;
 import com.clx.performance.service.OrderChildService;
+import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.performance.vo.app.owner.OwnerOrderChildVO;
 import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
@@ -13,10 +15,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @ClassName AppOwnerOrderChildController
@@ -45,4 +44,13 @@ public class AppOwnerOrderChildController {
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }
 
+
+    @ApiOperation(value = "查询运单详情", notes = "<br>By:刘海泉")
+    @UnitCovert(param = false)
+    @GetMapping("/getOrderChildInfo")
+    public Result<OrderChildVO> getOrderChildInfo(String childNo) {
+        return Result.ok(orderChildService.getOwnerOrderChildInfo(childNo));
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -524,6 +524,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         if(CollectionUtil.isNotEmpty(param.getStatus())){query.in(OrderChild :: getStatus,param.getStatus());}
         if(StringUtils.isNotBlank(param.getBeginTime())){query.ge(OrderChild :: getCreateTime,param.getBeginTime());}
         if(StringUtils.isNotBlank(param.getEndTime())){query.le(OrderChild :: getCreateTime,param.getEndTime());}
+        query.orderByDesc(OrderChild :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -90,4 +90,6 @@ public interface OrderChildService {
     IPage<CustomerComplaintOrderChildVO> pageCustomerComplaintOrderChild(PageParam param);
 
     IPage<OwnerOrderChildVO> pageOwnerOrderChildList(PageOwnerOrderChildListParam param);
+
+    OrderChildVO getOwnerOrderChildInfo(String childNo);
 }

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

@@ -1331,6 +1331,56 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
+    @Override
+    public OrderChildVO getOwnerOrderChildInfo(String childNo) {
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(
+                PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+
+        OrderChildVO result = orderChildStruct.convert(orderChild);
+        result.setLastArriveSendTime(orderGoods.getLastArriveSendTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        result.setLastArriveReceiveTime(orderGoods.getLastArriveReceiveTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveReceiveTime()));
+        result.setLastLoadTime(orderGoods.getLastLoadTime()==null? null : LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastLoadTime()));
+
+        // 磅单
+        if (Objects.equals(orderChild.getPoundStatus(), OrderChildPoundAuditEnum.Status.REJECT.getCode())) {
+            Optional<OrderChildPoundAudit> poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(childNo);
+            result.setPoundRemark(poundAuditDetail.orNull().getRemark());
+            result.setPoundRejectType(poundAuditDetail.orNull().getRejectType());
+        }
+        List<OrderChildImage> imageList = orderChildImageDao.listLoadAndUnload(childNo).orElse(new ArrayList<>());
+        result.setLoadImageList(imageList.stream().filter(
+                item -> Objects.equals(item.getType(), OrderChildImage.Type.LOAD.getCode())).map(
+                item -> item.getImage()).collect(Collectors.toList()));
+        result.setUnloadImageList(imageList.stream().filter(
+                item -> Objects.equals(item.getType(), OrderChildImage.Type.UNLOAD.getCode())).map(
+                item -> item.getImage()).collect(Collectors.toList()));
+
+        // 地址
+        Optional<FeignAddressVO> sendAndReceiveAddress = addressService.getSendAndReceiveAddress(
+                orderChild.getSendAddressId(), orderChild.getReceiveAddressId());
+        if (sendAndReceiveAddress.isPresent()) {
+            result.setSendAddressInfo(addressStruct.convert(sendAndReceiveAddress.get().getSendAddress()));
+        }
+        if (sendAndReceiveAddress.isPresent()) {
+            result.setReceiveAddressInfo(addressStruct.convert(sendAndReceiveAddress.get().getReceiveAddress()));
+        }
+
+
+        //查询结算信息
+        Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);
+        if(optional.isPresent()){
+            SettlementOwnerDetail settlementOwnerDetail = optional.get();
+            result.setRealFreight(settlementOwnerDetail.getFreight());
+            result.setLossFreight(settlementOwnerDetail.getLossFreight());
+            result.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
+            result.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        }
+
+
+        return result;
+    }
+
     @Override
     public IPage<OrderChildVO> pageOrderChild(PageOrderChildOfDriverParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();