运单积分统计

performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java

@@ -11,6 +11,7 @@ import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -127,6 +128,8 @@ public class OrderChildVO {
     private String loadTime;
     @ApiModelProperty(value = "卸车时间", example = "")
     private String unloadTime;
+    @ApiModelProperty(value = "司机确认交货时间", example = "")
+    private LocalDateTime confirmTime;
     @ApiModelProperty(value = "结算时间", example = "")
     private String settleTime;
     @ApiModelProperty(value = "取消时间", example = "")

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

@@ -36,6 +36,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     boolean updateLoadAndUnload(OrderChild item);
     boolean updatePoundAuditStatus(OrderChild item);
     boolean updateDriverConfirm(OrderChild item);
+    boolean updateSettlement(OrderChild item);
 
     boolean updateCancel(OrderChild item);
 
@@ -73,6 +74,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     int countCompleteByTruckNoAndPayFinishTime(@Param("truckNo") String truckNo,
                                                @Param("beginTime")String beginTime,
                                                @Param("endTime")String endTime,
-                                               @Param("list")List<String> orderNoList
+                                               @Param("list")List<String> orderGoodsNoList
     );
 }

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

@@ -114,6 +114,15 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
     @Override
     public boolean updateDriverConfirm(OrderChild item) {
+        return update(lUdWrapper()
+                .eq(OrderChild::getId, item.getId())
+                .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getConfirmTime, item.getConfirmTime())
+        );
+    }
+
+    @Override
+    public boolean updateSettlement(OrderChild item) {
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getStatus, item.getStatus())
@@ -236,14 +245,14 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, List<String> orderNoList) {
+    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, List<String> orderGoodsNoList) {
         return (int)count(lQrWrapper()
                 .eq(OrderChild::getTruckNo, truckNo)
                 .ge(OrderChild::getPayTime, beginTime)
                 .le(OrderChild::getPayTime, endTime)
                 .ge(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
                 .le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
-                .in(OrderChild::getOrderNo, orderNoList)
+                .in(OrderChild::getOrderGoodsNo, orderGoodsNoList)
         );
     }
 

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

@@ -76,6 +76,7 @@ public class OrderChild implements HasKey<Integer> {
     private LocalDateTime loadTime;                        //装车时间
     private LocalDateTime arriveReceiveTime;               //到达目的地时间
     private LocalDateTime unloadTime;                      //卸车时间
+    private LocalDateTime confirmTime;                     //司机确认交货时间
     private LocalDateTime settleTime;                      //结算时间
     private LocalDateTime cancelTime;                      //取消时间
     private LocalDateTime finishTime;                      //完成时间

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

@@ -898,6 +898,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         updateOrderGoodsComplete(orderGoods, count);
 
         orderChild.setStatus(OrderChildEnum.Status.UNSETTLE.getCode());
+        orderChild.setConfirmTime(LocalDateTime.now());
         orderChildDao.updateDriverConfirm(orderChild);
 
         // 更新车辆状态
@@ -921,7 +922,7 @@ public class OrderChildServiceImpl implements OrderChildService {
 
         // 结算完成
         orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
-        orderChildDao.updateDriverConfirm(orderChild);
+        orderChildDao.updateSettlement(orderChild);
 
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.SETTLEMENT.getCode(),