fix cancel before pay

邓伟
1 parent e7e60463
Showing 4 changed files with 47 additions and 3 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/RefundCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizPayment.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizRefundServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
@@ -4,7 +4,6 @@ import com.diligrp.cashier.mall.domain.rtmall.RtMarkBaseCO;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.util.List;
@@ -50,6 +49,11 @@ public class RefundCO extends RtMarkBaseCO {
     private String companyCode;
     /**
+     * 原因
+     */
+    private String refuseReason;
+
+    /**
      * 退款商品列表
      */
     @Valid
@@ -111,4 +115,12 @@ public class RefundCO extends RtMarkBaseCO {
     public void setReturnItemList(List<RefundItemCO> returnItemList) {
         this.returnItemList = returnItemList;
     }
+
+    public String getRefuseReason() {
+        return refuseReason;
+    }
+
+    public void setRefuseReason(String refuseReason) {
+        this.refuseReason = refuseReason;
+    }
 }
 package com.diligrp.cashier.mall.model;
 import com.diligrp.cashier.mall.context.MallInitializeContext;
+import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderPaymentVO;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
@@ -379,4 +380,13 @@ public class MallBizPayment extends BaseDO {
         this.setChannelId(event.getOutPayType());
         MallInitializeContext.getByPayChannel(this.getChannelId()).fill(this, event);
     }
+
+    public RefundCO ofRefund() {
+        RefundCO refundCo = new RefundCO();
+        refundCo.setOrderId(orderId);
+        refundCo.setTradeId(tradeId);
+        refundCo.setRefundFee(payFee);
+        refundCo.setRefuseReason("系统自动取消");
+        return refundCo;
+    }
 }
@@ -121,7 +121,7 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
      * doRefund
      */
     private RefundResultBO doRefund(MallBizRefund refund) {
-        CashierRefundBO cashierRefundBO = new CashierRefundBO(refund.getPayTradeId(), refund.getRefundFee(), null, "用户主动取消！");
+        CashierRefundBO cashierRefundBO = new CashierRefundBO(refund.getPayTradeId(), refund.getRefundFee(), null, ObjectUtils.defaultIfNull(refund.getRefuseReason(), "用户主动取消！"));
         LOG.info("doRefund cashierRefundBO: {}", JsonUtils.toJsonString(cashierRefundBO));
         RefundResultBO refundResultBO = cashierDeskManager.doRefund(cashierRefundBO);
         refund.setRefundTradeId(refundResultBO.getRefundId());
@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import com.diligrp.cashier.mall.MallConstants;
 import com.diligrp.cashier.mall.dao.MallBizOrderDao;
 import com.diligrp.cashier.mall.domain.rtmall.co.AuthLoginCO;
+import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.UserInfoVO;
 import com.diligrp.cashier.mall.domain.tax.TaxMessage;
 import com.diligrp.cashier.mall.exception.RtMartMallException;
@@ -32,7 +33,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 /**
@@ -99,6 +102,9 @@ public abstract class AbstractSourceChannel {
     @Transactional(rollbackFor = {Exception.class})
     public void paymentOnEvent(PaymentResultBO event, MallBizPayment mallBizPayment) {
         LOG.info("paymentOnEvent event: {} mallBizPayment: {}", JsonUtils.toJsonString(event), JsonUtils.toJsonString(mallBizPayment));
+
+        Integer curPayState = mallBizPayment.getPayState();
+
         // update mall_biz_payment
         mallBizPayment.payCallBack(event);
         mallBizPaymentService.updateByPay(mallBizPayment);
@@ -115,6 +121,9 @@ public abstract class AbstractSourceChannel {
                 .setHeader("x-delay", MallConstants.WAIT_DELAY_MILLIS)
                 .build();
         rabbitTemplate.convertAndSend(MallConstants.TAX_REPORT_DELAY_EXCHANGE, MallConstants.TAX_REPORT_DELAY_KEY, msg);
+
+        // check pay success
+        checkPayHandler(curPayState, mallBizPayment);
     }
     /**
@@ -195,6 +204,19 @@ public abstract class AbstractSourceChannel {
     }
     /**
+     * 如果payState=6表示系统主动取消，如果此时支付响应成功需要撤销该笔交易
+     */
+    private void checkPayHandler(final Integer curPayState,
+                                 MallBizPayment mallBizPayment) {
+        if (Objects.equals(curPayState, PaymentState.FAILED.getCode())
+                && (mallBizPayment = mallBizPaymentService.getByPayTradeId(mallBizPayment.getPayTradeId())) != null
+                && Objects.equals(mallBizPayment.getPayState(), PaymentState.SUCCESS.getCode())) {
+            RefundCO refundCo = mallBizPayment.ofRefund();
+            mallBizRefundService.refund(refundCo);
+        }
+    }
+
+    /**
      * 渠道
      */
     public abstract Integer source();