运单列表运单状态

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 
 public enum OrderChildEnum {
     ;
@@ -100,5 +101,13 @@ public enum OrderChildEnum {
     );
 
 
+    public static ConcurrentHashMap<Integer, String> map = new ConcurrentHashMap();
+    static {
+        for(OrderChildEnum.Status orderChildStatusEnum : OrderChildEnum.Status.values()){
+            map.put(orderChildStatusEnum.getCode(), orderChildStatusEnum.getName());
+        }
+    }
+
+
 
 }

performance-api/src/main/java/com/clx/performance/param/pc/PageCarrierOrderChildParam.java

+package com.clx.performance.param.pc;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @Author liruixin
+ * @create 2023-09-19 13:33
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCarrierOrderChildParam extends PageParam {
+
+    @ApiModelProperty(value="运单编号",example = "201457878")
+    private String childNo;
+
+    @ApiModelProperty(value="司机姓名",example = "募资类")
+    private String driverName;
+
+    @ApiModelProperty(value="司机手机号",example = "12222222222")
+    private String driverMobile;
+
+    @ApiModelProperty(value="发货地址",example = "北京")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "黄羊城")
+    private String receiveAddress;
+
+    @ApiModelProperty(value="状态",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="开始时间",example = "2020-01-01 10:10:10")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间",example = "2020-01-01 10:10:10")
+    private String endTime;
+
+}

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;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+
+@ApiModel(description = "运单表")
+@Getter
+@Setter
+@ToString
+@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 = "朝阳")
+    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;
+
+    @ApiModelProperty(value = "卸车磅单图片列表")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "发货地址详情")
+    private Address sendAddressInfo;
+    @ApiModelProperty(value = "发货地址详情")
+    private Address receiveAddressInfo;
+
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderChildStatusVO {
+
+
+    @ApiModelProperty("运单状态")
+    private Integer status;
+
+    @ApiModelProperty("运单值")
+    private String value;
+}
\ No newline at end of file

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

+package com.clx.performance.vo.pc;
+
+import com.msl.common.convertor.type.MoneyOutConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class PageCarrierOrderChildVO {
+
+    @ApiModelProperty(value="运单编号",example = "41441")
+    private String childNo;
+
+    @ApiModelProperty(value="运单状态",example = "1")
+    private Integer status;
+
+    @ApiModelProperty(value="货单编号",example = "41441")
+    private String orderGoodsNo;
+
+    @ApiModelProperty(value="货物名称",example = "煤炭")
+    private String goodsName;
+
+    @ApiModelProperty(value="司机姓名",example = "张安")
+    private String driverName;
+
+    @ApiModelProperty(value="司机手机号",example = "12222222222")
+    private String driverMobile;
+
+    @ApiModelProperty(value = "运费单价（元）", example = "1.23")
+    @MoneyOutConvert
+    private BigDecimal freightPrice;
+
+    @ApiModelProperty(value="装货净重",example = "10")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value="卸货净重",example = "41")
+    private BigDecimal unloadNet;
+
+    @ApiModelProperty(value="接单时间",example = "2020-01-01 10:10:10")
+    private String payTime;
+
+    @ApiModelProperty(value="完成时间",example = "2020-01-01 10:10:10")
+    private String finishTime;
+
+    @ApiModelProperty(value="发货地址",example = "吉林")
+    private String sendAddress;
+
+    @ApiModelProperty(value="收货地址",example = "山西")
+    private String receiveAddress;
+
+
+
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file

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

+package com.clx.performance.controller.pc;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
+import com.clx.performance.param.pc.PagePoundAuditParam;
+import com.clx.performance.param.pc.PoundAuditParam;
+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.OrderChildStatusVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
+import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/orderChild")
+@Validated
+@Api(tags = "承运端-运单列表")
+@AllArgsConstructor
+public class CarrierOrderChildController {
+
+    private final OrderChildService orderChildService;
+
+    private final OrderChildPoundAuditService orderChildPoundAuditService;
+
+    @ApiOperation(value = "运单列表",notes = "<br>By:李瑞新")
+    @PostMapping("/pageCarrierOrderChildList")
+    @UnitCovert(param = false)
+    public Result<PageData<PageCarrierOrderChildVO>> pageCarrierOrderChildList(@RequestBody PageCarrierOrderChildParam param) {
+        IPage<PageCarrierOrderChildVO> page = orderChildService.pageCarrierOrderChildList(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+
+    @ApiOperation(value = "运单详情详情",notes = "<br>By:李瑞新")
+    @GetMapping("/getCarrierOrderChildDetail")
+    @UnitCovert(param = false)
+    public Result<OrderChildPoundAuditDetailVO> getPoundAuditDetail(@NotBlank(message = "运单编号不能为空") String childNo) {
+        return Result.ok(orderChildPoundAuditService.getPoundAuditDetail(childNo));
+    }
+
+
+    @ApiOperation(value = "运单状态列表",notes = "<br>By:李瑞新")
+    @GetMapping("/getOrderChildStatusList")
+    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());
+        return Result.ok(result);
+    }
+
+}

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

@@ -5,8 +5,10 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
@@ -38,6 +40,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
 
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 
+    IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
+
 
     boolean updatePoundAuditStatus(OrderChild item);
 

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

@@ -8,8 +8,10 @@ import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
@@ -129,6 +131,12 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return baseMapper.pagePoundAuditList(page,param);
     }
 
+    @Override
+    public IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param) {
+        Page<PageCarrierOrderChildVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageCarrierOrderChildList(page,param);
+    }
+
     @Override
     public boolean updatePoundAuditStatus(OrderChild item) {
         return update(lUdWrapper()

performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.sqlProvider.OrderChildSqlProvider;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +39,7 @@ public interface OrderChildMapper extends BaseMapper<OrderChild> {
     @SelectProvider(type = OrderChildSqlProvider.class, method = "pagePoundAuditList")
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param);
 
+    @SelectProvider(type = OrderChildSqlProvider.class, method = "pageCarrierOrderChildList")
+    IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(@Param("page") Page<PageCarrierOrderChildVO> page, @Param("param") PageCarrierOrderChildParam param);
+
 }
\ No newline at end of file

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

@@ -2,9 +2,11 @@ package com.clx.performance.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.OrderChildPCVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 
 import java.util.List;
@@ -44,5 +46,7 @@ public interface OrderChildService {
 
     IPage<PageOrderChildPoundAuditVO> pagePoundAuditList(PagePoundAuditParam param);
 
+    IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param);
+
     List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo);
 }

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

@@ -14,6 +14,7 @@ import com.clx.performance.model.OrderChildImage;
 import com.clx.performance.model.OrderChildPoundAudit;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.*;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildPoundLogService;
@@ -22,6 +23,7 @@ import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.*;
 import com.clx.performance.vo.app.*;
 import com.clx.performance.vo.pc.OrderChildPCVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import com.clx.user.vo.feign.DriverTruckInfoFeignVo;
 import com.msl.common.base.Optional;
@@ -814,6 +816,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         return orderChildDao.pagePoundAuditList(param);
     }
 
+    @Override
+    public IPage<PageCarrierOrderChildVO> pageCarrierOrderChildList(PageCarrierOrderChildParam param) {
+        return orderChildDao.pageCarrierOrderChildList(param);
+    }
+
     @Override
     public List<OrderChildPCVO> getOrderChildInfoByOrderGoodsNo(String orderGoodsNo) {
         List<OrderChild> orderChildren = orderChildDao.getOrderChildInfoByOrderGoodsNo(orderGoodsNo)

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java

@@ -4,8 +4,10 @@ package com.clx.performance.sqlProvider;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
+import com.clx.performance.param.pc.PageCarrierOrderChildParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.pc.PageCarrierOrderChildVO;
 import com.clx.performance.vo.pc.PageOrderChildPoundAuditVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -65,7 +67,7 @@ public class OrderChildSqlProvider {
     public String pagePoundAuditList(@Param("page") Page<PageOrderChildPoundAuditVO> page, @Param("param") PagePoundAuditParam param) {
         return new SQL(){{
             SELECT("child_no,pound_status as status,goods_name,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
-                    "pound_status,date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
+                    "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
                     "date_format(load_time, '%Y-%m-%d %H:%i:%s') as loadTime," +
                     "date_format(unload_time, '%Y-%m-%d %H:%i:%s') as unloadTime ");
             FROM("order_child ");
@@ -86,4 +88,26 @@ public class OrderChildSqlProvider {
     }
 
 
+    public String pageCarrierOrderChildList(@Param("page") Page<PageCarrierOrderChildVO> page, @Param("param") PageCarrierOrderChildParam param) {
+        return new SQL(){{
+            SELECT("child_no,order_goods_no,status,goods_name,freight_price,send_address,receive_address,driver_name,driver_mobile,load_net,unload_net," +
+                    "date_format(pay_time, '%Y-%m-%d %H:%i:%s') as payTime," +
+                    "date_format(finish_time, '%Y-%m-%d %H:%i:%s') as finishTime");
+            FROM("order_child ");
+            if (StringUtils.isNotBlank(param.getBeginTime())) {WHERE("pay_time >= #{param.beginTime}");}
+            if (StringUtils.isNotBlank(param.getEndTime())) {WHERE("pay_time <= #{param.endTime}");}
+
+            if (StringUtils.isNotBlank(param.getChildNo())) {WHERE("child_no = #{param.childNo}");}
+            if (StringUtils.isNotBlank(param.getDriverName())) {WHERE("driver_name= #{param.driverName}");}
+            if (StringUtils.isNotBlank(param.getDriverMobile())) {WHERE("driver_mobile = #{param.driverMobile}");}
+
+            if (StringUtils.isNotBlank(param.getSendAddress())) {WHERE("send_address = #{param.sendAddress}");}
+            if (StringUtils.isNotBlank(param.getReceiveAddress())) {WHERE("receive_address= #{param.receiveAddress}");}
+            if (Objects.nonNull(param.getStatus())) {WHERE("status = #{param.status}");}
+
+            ORDER_BY("id desc");
+        }}.toString();
+    }
+
+
 }