Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into test

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

@@ -75,7 +75,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     int countCompleteByTruckNoAndPayFinishTime(@Param("truckNo") String truckNo,
                                                @Param("beginTime")String beginTime,
                                                @Param("endTime")String endTime,
-                                               @Param("confirmTime")String confirmTime,
                                                @Param("list")List<String> orderGoodsNoList
     );
 

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

@@ -259,12 +259,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     }
 
     @Override
-    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, String confirmTime, List<String> orderGoodsNoList) {
+    public int countCompleteByTruckNoAndPayFinishTime(String truckNo, String beginTime, String endTime, List<String> orderGoodsNoList) {
         return (int)count(lQrWrapper()
                 .eq(OrderChild::getTruckNo, truckNo)
-                .ge(OrderChild::getPayTime, beginTime)
-                .lt(OrderChild::getPayTime, endTime)
-                .le(OrderChild::getConfirmTime, confirmTime)
+                .ge(OrderChild::getConfirmTime, beginTime)
+                .le(OrderChild::getConfirmTime, endTime)
                 .ge(OrderChild::getStatus, OrderChildEnum.Status.UNSETTLE.getCode())
                 .le(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
                 .in(OrderChild::getOrderGoodsNo, orderGoodsNoList)

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

@@ -115,6 +115,9 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
                 .or()
                 .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
                 .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
+                .or()
+                .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
+                .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
         );
     }
 

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

@@ -431,7 +431,6 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
     private int orderChildDriverConfirm(IntegralStatistics statistics, AppIntegralRuleVO ruleInfo, OrderChild orderChild){
 
         LocalDateTime dateTimeDayStart = LocalDateTimeUtils.getDayStart();
-        LocalDateTime dateTimeDayNext = dateTimeDayStart.plusDays(1);
 
         int integralSum = 0;
 
@@ -441,10 +440,9 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
         List<String> enableOrderNoList = integralOrderDao.getAllOrderNoList();
         int finishNum = orderChildDao.countCompleteByTruckNoAndPayFinishTime(orderChild.getTruckNo(),
                 LocalDateTimeUtils.formatTime(dateTimeDayStart),
-                LocalDateTimeUtils.formatTime(dateTimeDayNext),
                 LocalDateTimeUtils.formatTime(orderChild.getConfirmTime()),
                 enableOrderNoList);
-        log.info("司机积分，车辆完成量，truckNo:{}, sum:{}", orderChild.getChildNo(), finishNum);
+        log.info("司机积分，车辆完成量，truckNo:{}, sum:{}", orderChild.getTruckNo(), finishNum);
 
         if (finishNum == 1){
             completeNumIntegral = ruleInfo.getOrderChildCompleteRule().getInteger1();

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

@@ -386,9 +386,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo);
         List<OrderGoodsTruckBind> getChildList = null;
         if (CollectionUtils.isNotEmpty(truckBindList)) {
-            List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i -> !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
-            //已接单的记录
-            getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList());
+            List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i ->
+                    !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode()) &&
+            !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+            ).collect(Collectors.toList());
+            //已接单的记录和完成的
+            getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())
+                    || i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
+                    )
+                    .collect(Collectors.toList());
 
             if (CollectionUtils.isNotEmpty(deleteList)) {
                 orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));

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

@@ -123,6 +123,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
                 settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
             }
+            if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) == 0){
+                settlementOwnerDetailDao.updateFinalPaymentStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.FinalPaymentStatus.NO_REQUIRE.getCode());
+            }
         }
 
         //更新状态