提交 b6aec48b authored 作者: aiqingguo's avatar aiqingguo

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

...@@ -87,7 +87,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -87,7 +87,7 @@ public class PaymentServiceImpl implements PaymentService {
log.info("发起支付请求日志 {}", payUserDTO); log.info("发起支付请求日志 {}", payUserDTO);
Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO)); Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO));
log.info("支付返回日志 {}", notify); log.info("支付返回日志 {}", notify);
if (notify == null) { if (notify == null || notify.getCode() != 0) {
//FEGIN返回null //FEGIN返回null
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "支付服务返回异常"); throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "支付服务返回异常");
} }
......
...@@ -146,7 +146,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler ...@@ -146,7 +146,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
// 车主 // 车主
if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.DRIVER.getCode())){ if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.DRIVER.getCode())){
payService.driverPay(settlement.getSettlementNo(), settlement.getTruckOwnUserNo(), settlement.getFigure().intValue()); payService.driverPay(settlement.getSettlementNo(), settlement.getTruckOwnUserNo(), settlement.getFigure().negate().intValue());
} }
// 平台 // 平台
else if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())) { else if (Objects.equals(settlement.getBreakContractPartyType(), BreakContractSettlementDriverEnum.BreakContractPartyType.PLATFORM.getCode())) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论