Merge branch 'v6.4_transportation_20231110' into test

performance-web/src/main/java/com/clx/performance/job/OwnerBreakContractSettlementJob.java

@@ -9,6 +9,7 @@ import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -28,6 +29,7 @@ public class OwnerBreakContractSettlementJob {
      * 如果货主2天都未确认，系统自动确认
      */
     @XxlJob("autoConfirmOwnerBreakSettle")
+    @Transactional(rollbackFor = Exception.class)
     public void autoConfirmOwnerBreakSettle() {
         try {
             List<BreakContractOwnerRecord> ownerRecords = breakContractOwnerRecordDao.ownerNoConfirmTwoDaysList(LocalDateTime.now());

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

@@ -26,6 +26,8 @@ import com.msl.common.utils.EncryptUtil;
 import com.msl.common.utils.HttpUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -90,9 +92,9 @@ public class PaymentServiceImpl implements PaymentService {
         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) {
+        if (notify == null || StringUtils.isNotBlank(notify.getMsg())) {
             //FEGIN返回null
-            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "支付服务返回异常");
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
         }
         return notify;
     }
@@ -131,9 +133,9 @@ public class PaymentServiceImpl implements PaymentService {
         log.info("发起支付请求日志 {}", 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) {
+        if (notify == null || StringUtils.isNotBlank(notify.getMsg())) {
             //FEGIN返回null
-            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "支付服务返回异常");
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
         }
         return notify;
     }