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

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

@@ -22,7 +22,7 @@ public enum OrderGoodsTruckBindEnum {
 
         ;
 
-        private final int code;
+        private final Integer code;
         private final String name;
 
         public static Optional<Status> getByCode(int code) {

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -50,6 +50,7 @@ public class OwnerBreakContractSettlementOwnerController {
     public Result<PageData<PageCarrierBreakContractSettlementOwnerVO>> pageOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         param.setOwnerUserNo(loginUserInfo.getUserNo());
+        System.out.println(param);
         IPage<PageCarrierBreakContractSettlementOwnerVO> page = breakContractSettlementOwnerService.pageCarrierBreakContractSettlementOwnerList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());
     }

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

@@ -129,6 +129,8 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return update(lUdWrapper()
                 .eq(OrderChild::getId, item.getId())
                 .set(OrderChild::getStatus, item.getStatus())
+                .set(OrderChild::getFinishTime, item.getFinishTime())
+                .set(OrderChild::getSettleTime, item.getSettleTime())
         );
     }
 

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

@@ -25,6 +25,7 @@ public class OrderChildLogDaoImpl extends BaseDaoImpl<OrderChildLogMapper, Order
                 , 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()
-                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode()).groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
+                , OrderChildLogEnum.Type.ARTIFICIAL_CANCEL.getCode(), OrderChildLogEnum.Type.COMPLETE.getCode())
+                .groupBy(OrderChildLog::getType).orderByAsc(OrderChildLog::getId));
     }
 }

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

@@ -159,11 +159,7 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
 
     @Override
     public IPage<IntegralTruckVO> driverPageTruckRank(DriverPageIntegralTruckRankParam param) {
-//        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
-
-
-        // 临时查本周排名
-        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek());
+        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
 
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();

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

@@ -415,7 +415,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         if (CollectionUtil.isNotEmpty(truckList)) {
             if (CollectionUtil.isNotEmpty(getChildList)) {
                 for (OrderGoodsTruckBind bind : getChildList) {
-                    if (!truckList.contains(bind.getTruckNo())) {
+                    if (OrderGoodsTruckBindEnum.Status.SUCCESS.getCode().equals(bind.getStatus()) && !truckList.contains(bind.getTruckNo())) {
                         throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前取消的车辆已经接单,车牌号为：" + bind.getTruckNo());
                     } else {
                         //已存在的记录不需要重新创建绑定记录

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

@@ -21,6 +21,7 @@ import com.clx.performance.service.breakcontract.BreakContractMqHandlerService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.payment.PayService;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.LocalDateTimeUtils;
 import com.msl.document.api.vo.ContractEvidenceRecordVo;
 import lombok.extern.slf4j.Slf4j;
@@ -129,6 +130,14 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
         breakContractSettlementLogService.saveBreakSettlementLog(settlementNo,
                 BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getCode(),BreakContractSettlementLogEnum.Type.CREATE_SETTLEMENT.getMsg(),
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(),record.getCreateBy(),record.getCreateName());
+
+        try {
+            pay(settlement);
+        }catch (ServiceSystemException e){
+            settlement.setPayRemark(e.getMessage());
+            breakContractSettlementDriverDao.updatePayFail(settlement);
+        }
+
     }
 
     private String settlementNoGenerate() {

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

@@ -437,6 +437,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         statusList.add(OrderChildEnum.Status.ARRIVE_RECEIVE.getCode());
         statusList.add(OrderChildEnum.Status.UNLOAD.getCode());
         statusList.add(OrderChildEnum.Status.UNSETTLE.getCode());
+        statusList.add(OrderChildEnum.Status.COMPLETE.getCode());
 
         //由于已经更新了订单状态为货主取消了
         if(Objects.equals(cancelType,CancelOrderEnum.Type.NOT_ARRIVE.getCode())){

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

@@ -24,6 +24,7 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.param.pc.payment.PayParam;
+import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.PaymentService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
 import com.clx.performance.service.settle.SettlementLogService;
@@ -89,6 +90,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildDao orderChildDao;
 
+    @Autowired
+    private OrderChildLogService orderChildLogService;
+
 
 
     @Override
@@ -183,9 +187,16 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
 
         if(1 == payType){
             orderChild.setStatus(OrderChildEnum.Status.COMPLETE.getCode());
+            orderChild.setSettleTime(LocalDateTime.now());
+            orderChild.setFinishTime(orderChild.getSettleTime());
             orderChildDao.updateSettlement(orderChild);
+
             settlementDriver.setStatus(SettlementDriverEnum.Status.SETTLED.getCode());
             settlementDriverDao.updateEntityByKey(settlementDriver);
+
+            // 日志
+            orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.COMPLETE.getCode(),
+                    OrderChildLogEnum.Type.COMPLETE.getMsg(), 0L, "系统");
         }else{
             settlementDriver.setPayErrorMsg(payErrorMsg);
             settlementDriverDao.updateEntityByKey(settlementDriver);