Merge branch 'v6.4_transportation_20231110' into test

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

@@ -87,7 +87,7 @@ public class PaymentServiceImpl implements PaymentService {
                 .uuid(UUID.randomUUID().toString().replaceAll("-", ""))
                 .notifyUrl(mslPaymentConfig.getNotifyhost() + NOTIFY_URL)
                 .payUnitDTO(payUnitDTO).build();
-        log.info("发起支付请求日志 {}", payUserDTO);
+        log.info("发起支付请求日志 {}", JSON.toJSONString(payUserDTO));
         Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO));
         log.info("支付返回日志 {}", notify);
         if (notify == null || notify.getCode() != 0) {

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

@@ -9,6 +9,7 @@ import com.clx.performance.service.payment.PayService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Objects;
 
@@ -22,6 +23,7 @@ public class BreakContractJobHandlerServiceImpl implements BreakContractJobHandl
     @Autowired
     private PayService payService;
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void pay(Integer settlementId){
 

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

@@ -77,6 +77,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
 
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void driverRecordAdd(BreakContractDriverRecordAddMqParam mq) {
         BreakContractDriverRecord record = breakContractDriverRecordDao.getEntityByKey(mq.getRecordId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
@@ -151,6 +152,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void paySuccess(String settlementNo){
         log.info("违约结算单支付回调, settlementNo:{}", settlementNo);