运单详情

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

 package com.clx.performance.vo.pc;
 
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.vo.app.Address;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,100 +20,59 @@ import java.util.List;
 @NoArgsConstructor
 public class CarrierOrderChildDetailVO {
 
-    @ApiModelProperty(value = "id", example = "1")
-    private Integer id;
-    @ApiModelProperty(value = "用户编号", example = "10000000000")
-    private Long userNo;
-    @ApiModelProperty(value = "货主用户编号", example = "100000000")
-    private Long ownerUserNo;
-    @ApiModelProperty(value = "货主名称", example = "张三")
-    private String ownerName;
+
     @ApiModelProperty(value = "运单编号", example = "100000000")
     private String childNo;
+
     @ApiModelProperty(value = "货单编号", example = "100000000")
     private String orderGoodsNo;
-    @ApiModelProperty(value = "订单编号", example = "10000000000")
-    private String orderNo;
 
-    @ApiModelProperty(value = "货物id", example = "1")
-    private Integer goodsId;
     @ApiModelProperty(value = "货物名称", example = "煤")
     private String goodsName;
+
     @ApiModelProperty(value = "运费单价（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal freightPrice;
-    @ApiModelProperty(value = "发货地址id", example = "1")
-    private Integer sendAddressId;
+
+
+    @ApiModelProperty(value = "损耗单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal lossPrice;
+
+    @ApiModelProperty(value = "订单运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal orderFreightPrice;
+
     @ApiModelProperty(value = "发货地址", example = "朝阳")
     private String sendAddress;
-    @ApiModelProperty(value = "收货地址id", example = "2")
-    private Integer receiveAddressId;
+
     @ApiModelProperty(value = "收货地址", example = "西城")
     private String receiveAddress;
-    @ApiModelProperty(value = "最晚装货时间", example = "")
-    private String loadDeadline;
 
-    @ApiModelProperty(value = "车辆ID", example = "1")
-    private Integer truckId;
     @ApiModelProperty(value = "车牌号", example = "京A12345")
     private String truckNo;
-    @ApiModelProperty(value = "载重（单位吨）", example = "12.34")
-    private BigDecimal truckLoad;
-    @ApiModelProperty(value = "车型", example = "挂车")
-    private String truckModel;
 
-    @ApiModelProperty(value = "司机用户编号", example = "1000000")
-    private Long driverUserNo;
     @ApiModelProperty(value = "司机姓名", example = "张三")
     private String driverName;
+
     @ApiModelProperty(value = "司机手机号", example = "130000000")
     private String driverMobile;
 
-    @ApiModelProperty(value = "装货毛重（单位吨）", example = "1.23")
-    private BigDecimal loadRough;
-    @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
-    private BigDecimal loadTare;
     @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
     private BigDecimal loadNet;
-    @ApiModelProperty(value = "卸货毛重（单位吨）", example = "1.23")
-    private BigDecimal unloadRough;
-    @ApiModelProperty(value = "卸货皮重（单位吨）", example = "1.23")
-    private BigDecimal unloadTare;
+
     @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
     private BigDecimal unloadNet;
-    @ApiModelProperty(value = "卸货磅单编号", example = "")
-    private String unloadPoundNo;
 
-    @ApiModelProperty(value = "拉运重量（单位吨）", example = "1.23")
-    private BigDecimal weight;
     @ApiModelProperty(value = "运费（元）", example = "1.23")
     @MoneyOutConvert
     private BigDecimal freight;
 
     @ApiModelProperty(value = "取消原因", example = "抢错了")
     private String cancelRemark;
-    @ApiModelProperty(value = "磅单审核状态 0 待审核 1 审核通过 2 审核驳回", example = "0")
-    private Integer poundStatus;
-    @ApiModelProperty(value = "磅单审核驳回原因", example = "交货信息错误")
-    private String poundRemark;
+
     @ApiModelProperty(value = "状态", example = "0")
     private Integer status;
-    @ApiModelProperty(value = "运输状态 0非运输中 1运输中", example = "1")
-    private Integer transitStatus;
-    public Integer getTransitStatus() {
-        return status==null || !OrderChildEnum.TRANSIT_lIST.contains(status)? 0 : 1;
-    }
-
-    @ApiModelProperty(value = "支付时间", example = "")
-    private String payTime;
-    @ApiModelProperty(value = "装车时间", example = "")
-    private String loadTime;
-    @ApiModelProperty(value = "卸车时间", example = "")
-    private String unloadTime;
-    @ApiModelProperty(value = "创建时间", example = "")
-    private String createTime;
-    @ApiModelProperty(value = "修改时间", example = "")
-    private String modifiedTime;
 
     @ApiModelProperty(value = "装车磅单图片列表")
     private List<String> loadImageList;
@@ -123,9 +80,11 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "卸车磅单图片列表")
     private List<String> unloadImageList;
 
-    @ApiModelProperty(value = "发货地址详情")
-    private Address sendAddressInfo;
-    @ApiModelProperty(value = "发货地址详情")
-    private Address receiveAddressInfo;
+    @ApiModelProperty(value = "流程节点")
+    private List<OrderChildLogVO> childLogs;
+
+    @ApiModelProperty(value = "磅单审核列表")
+    private List<OrderChildPoundAuditDetailVO> poundAudits;
+
 
 }
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildLogVO.java

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildLogVO  {
+
+    @ApiModelProperty(value = "运单编号", example = "11110")
+    private String childNo;
+
+    @ApiModelProperty(value = "类型", example = "10")
+    private Integer type;
+
+    @ApiModelProperty(value = "内容", example = "前往货源地")
+    private String remark;
+
+    @ApiModelProperty(value = "操作人类型 1货主 2，承运端", example = "1")
+    private Integer createType;
+
+    @ApiModelProperty(value = "操作人编号", example = "1454154")
+    private Long createBy;
+
+    @ApiModelProperty(value = "操作人名称", example = "平台")
+    private String createName;
+
+    @ApiModelProperty(value = "创建时间", example = "2020-01-01 10:10:10")
+    private String createTime;
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java

@@ -6,7 +6,7 @@ import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.service.OrderChildPoundAuditService;
 import com.clx.performance.service.OrderChildService;
-import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
+import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildStatusVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.msl.common.base.PageData;
@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -49,8 +50,8 @@ public class CarrierOrderChildController {
     @ApiOperation(value = "运单详情详情",notes = "<br>By:李瑞新")
     @GetMapping("/getCarrierOrderChildDetail")
     @UnitCovert(param = false)
-    public Result<OrderChildPoundAuditDetailVO> getPoundAuditDetail(@NotBlank(message = "运单编号不能为空") String childNo) {
-        return Result.ok(orderChildPoundAuditService.getPoundAuditDetail(childNo));
+    public Result<CarrierOrderChildDetailVO> getCarrierOrderChildDetail(@NotBlank(message = "运单编号不能为空") String childNo) {
+        return Result.ok(orderChildService.getCarrierOrderChildDetail(childNo));
     }
 
 
@@ -59,6 +60,7 @@ public class CarrierOrderChildController {
     public Result<List<OrderChildStatusVO>> getOrderChildStatusList() {
         ConcurrentHashMap<Integer, String> map = OrderChildEnum.map;
         List<OrderChildStatusVO> result = map.entrySet().stream().map(c -> new OrderChildStatusVO(c.getKey(), c.getValue())).collect(Collectors.toList());
+        result.stream().sorted(Comparator.comparing(OrderChildStatusVO::getStatus)).collect(Collectors.toList());
         return Result.ok(result);
     }
 

performance-web/src/main/java/com/clx/performance/dao/OrderChildLogDao.java

@@ -4,6 +4,8 @@ import com.clx.performance.mapper.OrderChildLogMapper;
 import com.clx.performance.model.OrderChildLog;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单日志
@@ -11,4 +13,5 @@ import com.msl.common.dao.BaseDao;
  * @Version: 1.0
  */
 public interface OrderChildLogDao extends BaseDao<OrderChildLogMapper, OrderChildLog, Integer> {
+    List<OrderChildLog> getOrderChildNodeLog(String childNo);
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildPoundAuditDao.java

@@ -5,6 +5,8 @@ import com.clx.performance.model.OrderChildPoundAudit;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 
 /**
  * @Author: aiqinguo
@@ -15,4 +17,6 @@ import com.msl.common.dao.BaseDao;
 public interface OrderChildPoundAuditDao extends BaseDao<OrderChildPoundAuditMapper, OrderChildPoundAudit, Integer> {
 
     Optional<OrderChildPoundAudit> getPoundAuditDetail(String childNo);
+
+    List<OrderChildPoundAudit> getPoundAuditList(String childNo);
 }

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

 package com.clx.performance.dao.impl;
 
 import com.clx.performance.dao.OrderChildLogDao;
+import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.mapper.OrderChildLogMapper;
 import com.clx.performance.model.OrderChildLog;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单图片
@@ -14,4 +17,12 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, OrderChildLog, Integer> implements OrderChildLogDao {
+    @Override
+    public List<OrderChildLog> getOrderChildNodeLog(String childNo) {
+        return list(lQrWrapper().eq(OrderChildLog::getChildNo,childNo).notIn(OrderChildLog::getType, OrderChildLogEnum.Type.PAY.getCode()
+                , OrderChildLogEnum.Type.RELOAD.getCode(), OrderChildLogEnum.Type.REUNLOAD.getCode()
+                , OrderChildLogEnum.Type.SETTLEMENT.getCode(), OrderChildLogEnum.Type.POUND_AUDIT.getCode()
+                , OrderChildLogEnum.Type.POUND_AUDIT_REJECT.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode()
+                , OrderChildLogEnum.Type.RELOAD_AND_REUNLOAD.getCode()).groupBy(OrderChildLog::getType).orderByDesc(OrderChildLog::getId));
+    }
 }

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

@@ -7,6 +7,8 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 /**
  * @Author: aiqinguo
@@ -23,4 +25,11 @@ public class OrderChildPoundAuditDaoImpl extends BaseDaoImpl<OrderChildPoundAudi
                 .orderByDesc(OrderChildPoundAudit::getId)
                 .last("limit 1")));
     }
+
+    @Override
+    public List<OrderChildPoundAudit> getPoundAuditList(String childNo) {
+        return super.list(lQrWrapper()
+                .eq(OrderChildPoundAudit::getChildNo, childNo)
+                .orderByDesc(OrderChildPoundAudit::getId));
+    }
 }

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

 package com.clx.performance.service;
 
+import com.clx.performance.model.OrderChildLog;
+
+import java.util.List;
+
 public interface OrderChildLogService {
 
     void saveOrderChildLog(String childNo, Integer type, String remark,
                            Integer createType,Long createBy, String createName);
     void saveDriverOrderChildLog(String childNo, Integer type, String remark, Long createBy, String createName);
+
+    List<OrderChildLog> getOrderChildNodeLog(String childNo);
     void saveCarrierOrderChildLog(String childNo, Integer type, String remark, Long createBy, String createName);
 
 }

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

@@ -5,6 +5,7 @@ import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.*;
+import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
@@ -49,4 +50,7 @@ public interface OrderChildService {
     IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
 
     List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo);
+
+    CarrierOrderChildDetailVO getCarrierOrderChildDetail(String childNo);
+
 }

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

@@ -8,6 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Slf4j
 @Service
 public class OrderChildLogServiceImpl implements OrderChildLogService {
@@ -35,6 +37,11 @@ public class OrderChildLogServiceImpl implements OrderChildLogService {
         saveOrderChildLog(childNo, type, remark, OrderChildLogEnum.CreateType.DRIVER.getCode(), createBy, createName);
     }
 
+    @Override
+    public List<OrderChildLog> getOrderChildNodeLog(String childNo) {
+        return orderChildLogDao.getOrderChildNodeLog(childNo);
+    }
+
     @Override
     public void saveCarrierOrderChildLog(String childNo, Integer type, String remark, Long createBy, String createName) {
         saveOrderChildLog(childNo, type, remark, OrderChildLogEnum.CreateType.PLATFORM.getCode(), createBy, createName);

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

@@ -9,10 +9,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.AddressService;
 import com.clx.performance.extranal.user.DriverService;
-import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.OrderChildImage;
-import com.clx.performance.model.OrderChildPoundAudit;
-import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.*;
 import com.clx.performance.param.app.*;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
@@ -22,6 +19,7 @@ import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.*;
 import com.clx.performance.vo.app.*;
+import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
@@ -79,6 +77,7 @@ public class OrderChildServiceImpl implements OrderChildService {
     private final OrderChildPoundStruct orderChildPoundStruct;
     private final OrderChildFreightStruct orderChildFreightStruct;
     private final AddressStruct addressStruct;
+    private final OrderChildLogStruct orderChildLogStruct;
 
     private final UniqueOrderNumService uniqueOrderNumService;
 
@@ -834,4 +833,14 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildStruct.convertList(orderChildren);
     }
 
+    @Override
+    public CarrierOrderChildDetailVO getCarrierOrderChildDetail(String childNo) {
+        OrderChild orderChild = orderChildDao.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+        CarrierOrderChildDetailVO carrierOrderChildDetailVO = orderChildStruct.carrierConvert(orderChild);
+        List<OrderChildPoundAudit> poundAuditList = orderChildPoundAuditDao.getPoundAuditList(childNo);
+        carrierOrderChildDetailVO.setPoundAudits(orderChildPoundStruct.convert(poundAuditList));
+        List<OrderChildLog> orderChildLog = orderChildLogService.getOrderChildNodeLog(childNo);
+        carrierOrderChildDetailVO.setChildLogs(orderChildLogStruct.convert(orderChildLog));
+        return null;
+    }
 }

performance-web/src/main/java/com/clx/performance/struct/OrderChildLogStruct.java

+package com.clx.performance.struct;
+
+import com.clx.performance.model.OrderChildLog;
+import com.clx.performance.vo.pc.OrderChildLogVO;
+import com.msl.common.utils.DateStructUtil;
+import com.msl.common.utils.DateUtils;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
+public interface OrderChildLogStruct {
+
+    List<OrderChildLogVO> convert(List<OrderChildLog> item);
+
+}

performance-web/src/main/java/com/clx/performance/struct/OrderChildPoundStruct.java

 package com.clx.performance.struct;
 
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildPoundAudit;
 import com.clx.performance.vo.app.OrderChildPoundInfoVO;
+import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
 import org.mapstruct.Mapper;
 
+import java.util.List;
+
 @Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {DateUtils.class})
 public interface OrderChildPoundStruct {
 
     OrderChildPoundInfoVO convert(OrderChild item);
 
+    List<OrderChildPoundAuditDetailVO> convert(List<OrderChildPoundAudit> item);
+
 }

performance-web/src/main/java/com/clx/performance/struct/OrderChildStruct.java

@@ -2,6 +2,7 @@ package com.clx.performance.struct;
 
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.CarrierOrderChildDetailVO;
 import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.msl.common.utils.DateStructUtil;
 import com.msl.common.utils.DateUtils;
@@ -16,4 +17,6 @@ public interface OrderChildStruct {
 
     List<OrderChildPCVO> convertList(List<OrderChild> item);
 
+    CarrierOrderChildDetailVO carrierConvert(OrderChild item);
+
 }