Merge branch 'main' of git3.nong12.com:cashierdesk/dili-cashier

huanggang
2 parents 0f9a084d 74246223
Showing 2 changed files with 3 additions and 4 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizRefundServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/PayNotifyServiceImpl.java
@@ -110,6 +110,7 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
      * 退款成功需要人工处理回调
      */
     private void refundManualEvent(RefundResultBO refundResultBO) {
+        LOG.info("refundManualEvent state: {}", Optional.ofNullable(refundResultBO).map(RefundResultBO::getState).orElse(null));
         if (Objects.nonNull(refundResultBO) && Objects.equals(refundResultBO.getState(), PaymentState.SUCCESS.getCode())) {
             payNotifyServiceImpl.onEvent(refundResultBO);
         }
@@ -18,8 +18,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import java.util.Objects;
-
 /**
  * @ClassName PayNotifyServiceImpl.java
  * @author dengwei
@@ -66,8 +64,8 @@ public class PayNotifyServiceImpl implements PayNotifyService {
     @ParamLogPrint(desc = "RefundResultBO")
     public void onEvent(RefundResultBO event) {
         MallBizRefund mallBizRefund = mallBizRefundDao.getByRefundTradeId(event.getRefundId());
-        if (Objects.equals(mallBizRefund.getRefundState(), PaymentState.PENDING.getCode())) {
-            LOG.info("refundOnEvent refundState is pending, refund_trade_id: {}", mallBizRefund.getRefundTradeId());
+        if (ObjectUtils.notEqual(mallBizRefund.getRefundState(), PaymentState.PENDING.getCode())) {
+            LOG.info("refundOnEvent refundState is pending ignore, refund_trade_id: {}", mallBizRefund.getRefundTradeId());
             return;
         }