Merge branch 'v6.4_transportation_20231110' into test

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/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() {