Merge branch 'test' of https://t.clxkj.cn/clx-java/clx-performance into test

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

@@ -39,6 +39,7 @@ public enum OrderChildLogEnum {
         DRIVER_CANCEL(110, "司机取消"),
         PLATFORM_CANCEL(111, "承运取消"),
         OWNER_CANCEL(112, "货主取消"),
+        ARTIFICIAL_CANCEL(113, "客服取消"),
 
         ;
 

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportReceiveAddressSaveParam.java

@@ -23,9 +23,9 @@ public class CollectWaitReportReceiveAddressSaveParam {
     @NotNull(message = "排队状态不能为空")
     private Integer waitType;
 
-    @ApiModelProperty(value = "预计站外等待时长", example = "1")
-    private BigDecimal stationOutTime;
-    @ApiModelProperty(value = "预计站外等待时长图片列表")
-    private List<String> stationOutImageList;
+    @ApiModelProperty(value = "预计等待时长", example = "1")
+    private BigDecimal stationTime;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> stationImageList;
 
 }

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectWaitReportSendAddressSaveParam.java

@@ -23,9 +23,9 @@ public class CollectWaitReportSendAddressSaveParam {
     @NotNull(message = "排队状态不能为空")
     private Integer waitType;
 
-    @ApiModelProperty(value = "预计站内等待时长", example = "1")
-    private BigDecimal stationInTime;
-    @ApiModelProperty(value = "预计站内等待时长图片列表")
-    private List<String> stationInImageList;
+    @ApiModelProperty(value = "预计等待时长", example = "1")
+    private BigDecimal stationTime;
+    @ApiModelProperty(value = "图片列表")
+    private List<String> stationImageList;
 
 }

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

@@ -24,6 +24,7 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
                 , OrderChildLogEnum.Type.GO_TO_RECEIVE.getCode(), OrderChildLogEnum.Type.ARRIVE_RECEIVE.getCode()
                 , OrderChildLogEnum.Type.LOAD.getCode(), OrderChildLogEnum.Type.UNLOAD.getCode()
                 , OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode()
-                , OrderChildLogEnum.Type.OWNER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode()).groupBy(OrderChildLog::getType));
+                , OrderChildLogEnum.Type.OWNER_CANCEL.getCode(), OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode()
+                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode()).groupBy(OrderChildLog::getType));
     }
 }

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

@@ -160,7 +160,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public List<OrderGoodsTruckBind> getCancelOrderGoods(List<String> truckList, String beginTime, String endTime) {
         return baseMapper.selectList(lQrWrapper().in(OrderGoodsTruckBind::getTruckNo, truckList)
-//                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.CANCEL.getCode())
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.NORMAL.getCode())
                 .le(OrderGoodsTruckBind::getCreateTime, endTime)
                 .ge(OrderGoodsTruckBind::getCreateTime, beginTime)
         );

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

@@ -699,6 +699,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderChildDao.updateEntityByKey(update);
 
         orderCancelComponent.backFillTonnageForArtificial(orderChild.getOrderGoodsNo(), orderChild.getWeight());
+        goodsOrderTruckRecordComponent.releaseDriverCard(orderChild.getOrderGoodsNo(), orderChild.getTruckNo());
+        driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
 
         orderChildLogService.saveOrderChildLog(orderChild.getChildNo(),
                 OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode(), OrderChildEnum.Status.ARTIFICIAL_CANCEL.getName(),

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

@@ -1678,10 +1678,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         //查询运单
         OrderChild orderChild = orderChildDao.getGoingLatestOrderChild(loginUserInfo.getUserNo());
         GoingOrderChildVO orderChildVO = orderChildStruct.convertGoingOrder(orderChild);
-        //查询货单
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
-                PerformanceResultEnum.ORDER_INVALID);
-        orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        if(orderChildVO != null){
+            //查询货单
+            OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
+                    PerformanceResultEnum.ORDER_INVALID);
+            orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        }
+
         return orderChildVO;
     }
 

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

@@ -67,8 +67,8 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
         collectTruckWait.setReportType(CollectTruckWait.ReportType.LOAD.getCode());
         collectTruckWait.setWaitType(param.getWaitType());
 
-        collectTruckWait.setStationInTime(param.getStationInTime());
-        collectTruckWait.setStationInImage(param.getStationInImageList()==null? null : JSON.toJSONString(param.getStationInImageList()));
+        collectTruckWait.setStationInTime(param.getStationTime());
+        collectTruckWait.setStationInImage(param.getStationImageList()==null? null : JSON.toJSONString(param.getStationImageList()));
 
         collectTruckWait.setReportTime(LocalDateTime.now());
         collectTruckWait.setCreateTime(collectTruckWait.getReportTime());
@@ -97,8 +97,8 @@ public class CollectWaitReportServiceImpl implements CollectWaitReportService {
         collectTruckWait.setReportType(CollectTruckWait.ReportType.UNLOAD.getCode());
         collectTruckWait.setWaitType(param.getWaitType());
 
-        collectTruckWait.setStationInTime(param.getStationOutTime());
-        collectTruckWait.setStationInImage(param.getStationOutImageList()==null? null:JSON.toJSONString(param.getStationOutImageList()));
+        collectTruckWait.setStationInTime(param.getStationTime());
+        collectTruckWait.setStationInImage(param.getStationImageList()==null? null:JSON.toJSONString(param.getStationImageList()));
 
         collectTruckWait.setReportTime(LocalDateTime.now());
         collectTruckWait.setCreateTime(collectTruckWait.getReportTime());