接单

performance-api/src/main/java/com/clx/performance/app/OrderChildArriveReceiveAddressParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildArriveReceiveAddressParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildArriveSendAddressParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildArriveSendAddressParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildCancelParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildCancelParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "取消原因", example = "信息错误")
+    @NotBlank(message = "取消原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildConfirmParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildConfirmParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildGoToReceiveAddressParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildGoToReceiveAddressParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildGoToSendAddressParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildGoToSendAddressParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildLoadAndUnloadAgainParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildLoadAndUnloadAgainParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装货毛重（单位吨）", example = "2.46")
+    @NotNull(message = "装货毛重不能为空")
+    private BigDecimal loadRough;
+    @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
+    @NotNull(message = "装货皮重不能为空")
+    private BigDecimal loadTare;
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    @NotNull(message = "装货净重不能为空")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "磅单图片列表")
+    @NotEmpty(message = "请上传磅单照片")
+    private List<String> loadImageList;
+
+    @ApiModelProperty(value = "卸货毛重（单位吨）", example = "2.46")
+    @NotNull(message = "装货毛重不能为空")
+    private BigDecimal unloadRough;
+    @ApiModelProperty(value = "卸货皮重（单位吨）", example = "1.23")
+    @NotNull(message = "装货皮重不能为空")
+    private BigDecimal unloadTare;
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    @NotNull(message = "装货净重不能为空")
+    private BigDecimal unloadNet;
+
+    @ApiModelProperty(value = "磅单图片列表")
+    @NotEmpty(message = "请上传磅单照片")
+    private List<String> unloadImageList;
+
+}

performance-api/src/main/java/com/clx/performance/app/OrderChildLoadParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildLoadParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装货毛重（单位吨）", example = "2.46")
+    @NotNull(message = "装货毛重不能为空")
+    private BigDecimal loadRough;
+    @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
+    @NotNull(message = "装货皮重不能为空")
+    private BigDecimal loadTare;
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    @NotNull(message = "装货净重不能为空")
+    private BigDecimal loadNet;
+
+    @ApiModelProperty(value = "磅单图片列表")
+    @NotEmpty(message = "请上传磅单照片")
+    private List<String> loadImageList;
+
+}

performance-api/src/main/java/com/clx/performance/app/SaveOrderChildParam.java → performance-api/src/main/java/com/clx/performance/app/OrderChildSaveParam.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 @NoArgsConstructor
-public class SaveOrderChildParam {
+public class OrderChildSaveParam {
 
     @ApiModelProperty(value = "货单编号", example = "100000000")
     @NotBlank(message = "货单编号不能为空")

performance-api/src/main/java/com/clx/performance/app/OrderChildUnloadParam.java

+package com.clx.performance.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class OrderChildUnloadParam {
+
+    @ApiModelProperty(value = "运单编号", example = "100000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "卸货毛重（单位吨）", example = "2.46")
+    @NotNull(message = "装货毛重不能为空")
+    private BigDecimal unloadRough;
+    @ApiModelProperty(value = "卸货皮重（单位吨）", example = "1.23")
+    @NotNull(message = "装货皮重不能为空")
+    private BigDecimal unloadTare;
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    @NotNull(message = "装货净重不能为空")
+    private BigDecimal unloadNet;
+
+    @ApiModelProperty(value = "磅单图片列表")
+    @NotEmpty(message = "请上传磅单照片")
+    private List<String> unloadImageList;
+
+}

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

@@ -13,12 +13,24 @@ public enum OrderChildEnum {
     @AllArgsConstructor
     public enum Status {
 
-        CREATED(10, "新创建"),
-        ORDERS(20, "接单成功"),
+        CREATED(10, "已接单"),
+
+        PAYING(20, "支付中"),
+
         GO_TO_SEND(30, "前往货源地"),
         ARRIVE_SEND(40, "到达货源地"),
+        LOAD(60 , "装货成功"),
+        GO_TO_RECEIVE(50, "前往目的地"),
+        ARRIVE_RECEIVE(60 , "到达目的地"),
+        DRIVER_CONFIRM(70, "收货待确认"),
+
+        POUND_AUDIT_FAIL(80, "磅单审核驳回"),
+        UNSETTLED(80, "待结算"),
 
-        COMPLETE(150, "完成"),//完成
+        COMPLETE(100, "完成"),
+
+        DRIVER_CANCEL(200, "司机取消"),
+        PLATFORM_CANCEL(200, "平台取消"),
 
 //
 //        OWNER_CONFIRM(50, "货主确认车辆"),//货主确认车辆
@@ -71,4 +83,5 @@ public enum OrderChildEnum {
         }
     }
 
+
 }

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

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderChildLogEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        CREATED(1, "接单成功"),
+
+        GO_TO_SEND(3, "前往货源地"),
+        ARRIVE_SEND(4, "到达货源地"),
+        GO_TO_RECEIVE(5, "前往目的地"),
+        ARRIVE_RECEIVE(6 , "到达目的地"),
+        POUND_AUDIT(7, "磅单审核"),
+
+        LOAD(11, "提交装货信息"),
+        UNLOAD(12, "提交卸货信息"),
+        RELOAD(13, "修改装货信息"),
+        REUNLOAD(14, "修改卸货信息"),
+        RELOAD_AND_REUNLOAD(15, "修改装货、卸货信息"),
+
+        DRIVER_CONFIRM(21, "司机确认收货"),
+        COMPLETE(21, "完成"),
+
+        DRIVER_CANCEL(31, "司机取消运单"),
+        OWNER_CANCEL(32, "货主取消运单"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

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

 package com.clx.performance.controller.app;
 
-import com.clx.performance.app.SaveOrderChildParam;
+import com.clx.performance.app.*;
 import com.clx.performance.service.OrderChildService;
-import com.clx.performance.app.SaveOrderChildVo;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -33,9 +32,81 @@ public class DriverOrderChildController {
 
     @ApiOperation(value = "接单", notes = "<br>By:艾庆国")
     @PostMapping("/saveOrderChild")
-    public Result<SaveOrderChildVo> saveOrderChild(@RequestBody @Validated SaveOrderChildParam param) {
+    public Result<SaveOrderChildVo> saveOrderChild(@RequestBody @Validated OrderChildSaveParam param) {
 
         return Result.ok(orderChildService.saveOrderChild(param));
     }
 
+    @ApiOperation(value = "前往货源地", notes = "<br>By:艾庆国")
+    @PostMapping("/updateGotoSendAddress")
+    public Result<Void> updateGotoSendAddress(@RequestBody @Validated OrderChildGoToSendAddressParam param) {
+        orderChildService.updateGotoSendAddress(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "到达货源地", notes = "<br>By:艾庆国")
+    @PostMapping("/updateArriveSendAddress")
+    public Result<Void> updateArriveSendAddress(@RequestBody @Validated OrderChildArriveSendAddressParam param) {
+        orderChildService.updateArriveSendAddress(param);
+
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "前往目的地", notes = "<br>By:艾庆国")
+    @PostMapping("/updateGotoReceiveAddress")
+    public Result<Void> updateGotoReceiveAddress(@RequestBody @Validated OrderChildGoToReceiveAddressParam param) {
+        orderChildService.updateGotoReceiveAddress(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "到达目的地", notes = "<br>By:艾庆国")
+    @PostMapping("/updateArriveReceiveAddress")
+    public Result<Void> updateArriveReceiveAddress(@RequestBody @Validated OrderChildArriveReceiveAddressParam param) {
+        orderChildService.updateArriveReceiveAddress(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "装车(首次、再次)", notes = "<br>By:艾庆国")
+    @PostMapping("/updateLoad")
+    public Result<Void> updateLoad(@RequestBody @Validated OrderChildLoadParam param) {
+        orderChildService.updateLoad(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "卸车(首次、再次)", notes = "<br>By:艾庆国")
+    @PostMapping("/updateUnload")
+    public Result<Void> updateUnload(@RequestBody @Validated OrderChildUnloadParam param) {
+        orderChildService.updateUnload(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "重新装车卸车", notes = "修改装车卸车信息<br>By:艾庆国")
+    @PostMapping("/updateLoadAndUnloadAgain")
+    public Result<Void> updateLoadAndUnloadAgain(@RequestBody @Validated OrderChildLoadAndUnloadAgainParam param) {
+        orderChildService.updateLoadAndUnloadAgain(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "确认交货", notes = "<br>By:艾庆国")
+    @PostMapping("/updateConfirm")
+    public Result<Void> updateConfirm(@RequestBody @Validated OrderChildConfirmParam param) {
+        orderChildService.updateConfirm(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "取消运单", notes = "<br>By:艾庆国")
+    @PostMapping("/updateCancel")
+    public Result<Void> updateCancel(@RequestBody @Validated OrderChildCancelParam param) {
+        orderChildService.updateCancel(param);
+
+        return Result.ok();
+    }
 }

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

@@ -2,8 +2,11 @@ package com.clx.performance.dao;
 
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.time.LocalDateTime;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单表
@@ -12,6 +15,16 @@ import com.msl.common.dao.BaseDao;
  */
 public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Integer> {
 
+    boolean updateCancel(OrderChild item);
+    boolean updateLoad(OrderChild item);
+    boolean updateUnload(OrderChild item);
+    boolean updateLoadAndUnload(OrderChild item);
+    boolean updateDriverConfirm(OrderChild item);
+
+
+    Optional<OrderChild> getByChildNo(String childNo);
+
+    long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime);
 
 
 }

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

@@ -11,4 +11,9 @@ import com.msl.common.dao.BaseDao;
  * @Version: 1.0
  */
 public interface OrderChildImageDao extends BaseDao<OrderChildImageMapper, OrderChildImage, Integer> {
+
+    boolean deleteLoad(String childNo);
+    boolean deleteUnload(String childNo);
+    boolean deleteLoadAndUnload(String childNo);
+
 }

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

 package com.clx.performance.dao.impl;
 
 import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+
 /**
  * @Author: aiqinguo
  * @Description: 运单表
@@ -14,4 +18,51 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild, Integer> implements OrderChildDao {
+    @Override
+    public boolean updateCancel(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getChildNo, item.getChildNo())
+                .set(OrderChild::getStatus, item.getStatus())
+        );
+    }
+
+    @Override
+    public boolean updateLoad(OrderChild item) {
+        return false;
+    }
+
+    @Override
+    public boolean updateUnload(OrderChild item) {
+        return false;
+    }
+
+    @Override
+    public boolean updateLoadAndUnload(OrderChild item) {
+        return false;
+    }
+
+    @Override
+    public boolean updateDriverConfirm(OrderChild item) {
+        return false;
+    }
+
+    @Override
+    public Optional<OrderChild> getByChildNo(String childNo) {
+        return Optional.of(childNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderChild::getChildNo, item)
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public long countOfCancel(Long userNo, LocalDateTime startTime, LocalDateTime endTime) {
+
+        return count(lQrWrapper()
+                .eq(OrderChild::getChildNo, userNo)
+                .eq(OrderChild::getStatus, OrderChildEnum.Status.DRIVER_CANCEL.getCode())
+                .ge(OrderChild::getCreateTime, startTime)
+                .le(OrderChild::getCreateTime, endTime)
+        );
+    }
 }

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

@@ -14,4 +14,30 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildImageImpl extends BaseDaoImpl<OrderChildImageMapper, OrderChildImage, Integer> implements OrderChildImageDao {
+
+    @Override
+    public boolean deleteLoad(String childNo) {
+        return remove(lQrWrapper()
+                .eq(OrderChildImage::getChildNo, childNo)
+                .eq(OrderChildImage::getType, OrderChildImage.Type.LOAD.getCode())
+        );
+    }
+
+    @Override
+    public boolean deleteUnload(String childNo) {
+        return remove(lQrWrapper()
+                .eq(OrderChildImage::getChildNo, childNo)
+                .eq(OrderChildImage::getType, OrderChildImage.Type.UNLOAD.getCode())
+        );
+    }
+
+    @Override
+    public boolean deleteLoadAndUnload(String childNo) {
+
+        return remove(lQrWrapper()
+                .eq(OrderChildImage::getChildNo, childNo)
+                .in(OrderChildImage::getType, OrderChildImage.Type.LOAD.getCode(), OrderChildImage.Type.UNLOAD.getCode())
+        );
+
+    }
 }

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -45,9 +45,15 @@ public class OrderChild implements HasKey<Integer> {
     private String driverName;                      //司机姓名
     private String driverMobile;                    //司机手机号
 
-    private BigDecimal loadWeight;                  //装车净重（单位吨）
-    private BigDecimal unloadWeight;                //卸车净重（单位吨）
-    private BigDecimal weight;                      //净重（单位吨）
+    private BigDecimal loadRough;                   //装货毛重（单位吨）
+    private BigDecimal loadTare;                    //装货皮重（单位吨）
+    private BigDecimal loadNet;                     //装货净重（单位吨）
+
+    private BigDecimal unloadRough;                 //卸货毛重（单位吨）
+    private BigDecimal unloadTare;                  //卸货皮重（单位吨）
+    private BigDecimal unloadNet;                   //卸货净重（单位吨）
+
+    private BigDecimal weight;                      //拉运重量（单位吨）
     private Integer status;                         //状态
 
     private LocalDateTime payTime;                         //支付时间

performance-web/src/main/java/com/clx/performance/model/OrderChildImage.java

@@ -3,10 +3,14 @@ package com.clx.performance.model;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.util.Arrays;
+import java.util.Optional;
+
 /**
 * @Author: aiqinguo
 * @Description: 运单图片
@@ -33,4 +37,21 @@ public class OrderChildImage implements HasKey<Integer> {
         return id;
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        LOAD(1, "装货磅单图片"),
+        UNLOAD(2, "卸货磅单图片")
+
+        ;
+
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+
 }
\ No newline at end of file

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

 package com.clx.performance.service;
 
-import com.clx.performance.app.SaveOrderChildParam;
-import com.clx.performance.app.SaveOrderChildVo;
+import com.clx.performance.app.*;
 
 
 /**
@@ -13,5 +12,19 @@ import com.clx.performance.app.SaveOrderChildVo;
 
 public interface OrderChildService {
 
-    SaveOrderChildVo saveOrderChild(SaveOrderChildParam param);
+    SaveOrderChildVo saveOrderChild(OrderChildSaveParam param);
+
+    void updateGotoSendAddress(OrderChildGoToSendAddressParam param);
+    void updateArriveSendAddress(OrderChildArriveSendAddressParam param);
+    void updateGotoReceiveAddress(OrderChildGoToReceiveAddressParam param);
+    void updateArriveReceiveAddress(OrderChildArriveReceiveAddressParam param);
+
+    void updateLoad(OrderChildLoadParam param);
+    void updateUnload(OrderChildUnloadParam param);
+    void updateLoadAndUnloadAgain(OrderChildLoadAndUnloadAgainParam param);
+
+    void updateConfirm(OrderChildConfirmParam param);
+
+    void updateCancel(OrderChildCancelParam param);
+
 }