BUG修复

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

@@ -84,8 +84,8 @@ public enum PerformanceResultEnum implements ResultEnum {
     SETTLEMENT_NO_FOUND(1401, "结算单不存在"),
     MONEY_NO_SAME(1501, "货主提现金额和平台支付金额不一致"),
 
-    ORDER_GOODS_WEIGHT_NOT_HAVE(1601, "货单可拉运吨数不足")
-
+    ORDER_GOODS_WEIGHT_NOT_HAVE(1601, "货单可拉运吨数不足"),
+    ORDER_GOODS_STATUS_NOT_GET(1602, "当前货单已关闭不可继续提取")
     ;
     private final int code;
     private final String msg;

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -211,15 +211,13 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     childSum = childSum.add(orderChild.getWeight());
                     childNoList.add(orderChild.getChildNo());
                     //释放车辆
-                    //driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
+                    driverService.updateOrderStatus(orderChild.getDriverUserNo(), DriverInfoEnum.DriverStatus.NO.getCode(), orderChild.getTruckId(), 1);
                     orderChild.setCancelTime(DateUtils.parseDateTime(now).get());
                     orderChild.setFinishTime(DateUtils.parseDateTime(now).get());
-                    //breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, 0L, "系统");
-
+                    breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, 0L, "系统");
                     //保存运单日志数据
-                    // 日志
-/*                    orderChildLogService.saveDriverOrderChildLog(orderChild.getChildNo(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
-                            OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), 0L, "系统");*/
+                    orderChildLogService.saveDriverOrderChildLog(orderChild.getChildNo(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(),
+                            OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), 0L, "系统");
 
                 }
                 log.info("取消运单ID集合：{}", childNoList);
@@ -227,14 +225,15 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                     orderChildDao.batchUpdateOrderChildStatus(OrderChildEnum.Status.PLATFORM_CANCEL.getCode(), "系统取消", now, now, childNoList);
                 }
 
-                RollbackOrderWeightParam param = new RollbackOrderWeightParam();
-                param.setOrderNo(orderGoods.getOrderNo());
-                param.setResidueWeight(orderGoods.getResidueTransportWeight());
 
                 //当前货单已经到了最晚接单时间，所有相关状态均已经处理完毕，此刻单独处理运单的数据
                 if (OrderGoodsStatusEnum.Status.SUCCESS.getCode().equals(orderGoods.getOrderGoodsStatus())
                         || OrderGoodsStatusEnum.Status.COMPLETED.getCode().equals(orderGoods.getOrderGoodsStatus())
                 ) {
+                    RollbackOrderWeightParam param = new RollbackOrderWeightParam();
+                    param.setOrderNo(orderGoods.getOrderNo());
+                    param.setResidueWeight(childSum);
+
                     //当前情况需要回填订单的余量
                     if (orderGoods.getTruckDemand().equals(1) || orderGoods.getTruckDemand().equals(3)) {
                         param.setOwnResidueCarryWeight(BigDecimal.ZERO);

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

@@ -143,6 +143,13 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         if (i == 0){
             return;
         } else if (i > 0) {
+            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
+                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
+            ) {
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
+            }
+
             if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
             }

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

@@ -1396,6 +1396,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         if (i == 0){
             return;
         } else if (i > 0) {
+            if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
+                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+                    || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
+            ) {
+                throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_STATUS_NOT_GET);
+            }
+            
             if (orderGoods.getResidueTransportWeight().compareTo(dif) < 0) {
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_GOODS_WEIGHT_NOT_HAVE);
             }

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

@@ -136,6 +136,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     public void updateOrderGoodsReduceWeightAndStatusAmountLoad(OrderGoods orderGoods, BigDecimal orderChildWeight, Integer orderGoodsStatus) {
         if (orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.CANCEL.getCode())
             || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.COMPLETED.getCode())
+            || orderGoods.getOrderGoodsStatus().equals(OrderGoodsStatusEnum.Status.SUCCESS.getCode())
         ) {
             if (orderChildWeight.compareTo(BigDecimal.ZERO) < 0) {
                 orderChildWeight = orderChildWeight.negate();