提交 3b8e5c93 authored 作者: 杨启发's avatar 杨启发

Merge remote-tracking branch 'origin/v18.5_pound_list_ocr_20240701' into…

Merge remote-tracking branch 'origin/v18.5_pound_list_ocr_20240701' into v18.5_pound_list_ocr_20240701
...@@ -383,7 +383,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -383,7 +383,7 @@ public class PaymentServiceImpl implements PaymentService {
orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull(); orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
if (null == orderPaymentOptional){ if (null == orderPaymentOptional){
log.error("数据不存在 {}, {}" ,orderNo,msg); log.error("数据不存在 {}, {}" ,orderNo,msg);
return; throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
} }
orderPaymentOptional.setStatus(PaymentStatusEnum.FAIL.getValue()); orderPaymentOptional.setStatus(PaymentStatusEnum.FAIL.getValue());
orderPaymentOptional.setReason(msg); orderPaymentOptional.setReason(msg);
...@@ -396,8 +396,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -396,8 +396,7 @@ public class PaymentServiceImpl implements PaymentService {
OrderPayment orderPaymentOptional = OrderPayment orderPaymentOptional =
orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull(); orderPaymentDao.selectByRelationNo(orderNo,operation,paymentItem).orNull();
if (null == orderPaymentOptional){ if (null == orderPaymentOptional){
log.error("数据不存在 {}, {}" ,orderNo); throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
return;
} }
orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue()); orderPaymentOptional.setStatus(PaymentStatusEnum.SUCCESS.getValue());
orderPaymentDao.updateEntityByKey(orderPaymentOptional); orderPaymentDao.updateEntityByKey(orderPaymentOptional);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论