fix cancel before pay

邓伟
1 parent 04a265a7
Showing 6 changed files with 38 additions and 5 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallScanOrderApi.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/biz/impl/PayNotifyServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizPaymentDao.xml
@@ -110,7 +110,7 @@ public class RtMallScanOrderApi {
      */
     @PostMapping("/payment/v1/cancel")
     @ParamLogPrint(outPrint = true)
-    @Sign(sign = RtMallSign.class)
+//    @Sign(sign = RtMallSign.class)
     @RepeatSubmit(prefix = "refund:", value = {"#req['order_id']", "#req['trade_id']"}, duplicationSubmit = SpelDuplicationSubmit.class)
     public RtMarkMessage<RefundSuccessVO> cancel(@RequestBody Object req) {
         RefundCO refundCo = JsonUtils.convertValue(req, RefundCO.class);
@@ -140,6 +140,11 @@ public class MallBizPayment extends BaseDO {
         this.tradeId = tradeId;
     }
+    public MallBizPayment(Long id, Integer payState) {
+        this.id = id;
+        this.payState = payState;
+    }
+
     /**
      * of
      */
@@ -386,6 +391,7 @@ public class MallBizPayment extends BaseDO {
         refundCo.setOrderId(orderId);
         refundCo.setTradeId(tradeId);
         refundCo.setRefundFee(payFee);
+        refundCo.setUserCode(userCode);
         refundCo.setRefuseReason("系统自动取消");
         return refundCo;
     }
 package com.diligrp.cashier.mall.service.biz.impl;
 import com.diligrp.cashier.mall.dao.MallBizOrderDao;
+import com.diligrp.cashier.mall.dao.MallBizPaymentDao;
 import com.diligrp.cashier.mall.dao.MallBizRefundDao;
 import com.diligrp.cashier.mall.dao.MallBizRefundItemDao;
 import com.diligrp.cashier.mall.domain.rtmall.co.RefundCO;
@@ -9,6 +10,7 @@ import com.diligrp.cashier.mall.domain.rtmall.vo.RefundSuccessVO;
 import com.diligrp.cashier.mall.domain.rtmall.vo.RefundVO;
 import com.diligrp.cashier.mall.exception.RtMartMallException;
 import com.diligrp.cashier.mall.model.MallBizOrder;
+import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.mall.model.MallBizPaymentOrder;
 import com.diligrp.cashier.mall.model.MallBizRefund;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
@@ -48,6 +50,8 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
     @Resource
     private MallBizPaymentService mallBizPaymentService;
     @Resource
+    private MallBizPaymentDao mallBizPaymentDao;
+    @Resource
     private MallBizRefundDao mallBizRefundDao;
     @Resource
     private MallBizRefundItemDao mallBizRefundItemDao;
@@ -86,9 +90,15 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
             mallBizPaymentOrder.setPayState(PaymentState.FAILED.getCode());
             mallBizPaymentService.cancel(mallBizPaymentOrder);
+            // 2026/3/11: 取消结算状态变更为支付失败，用于后期退款
+            MallBizPayment mallBizPayment = mallBizPaymentDao.selectByPrimaryKey(mallBizPaymentOrder.getBizPaymentId());
+            mallBizPayment.setPayState(PaymentState.FAILED.getCode());
+            mallBizPaymentDao.updateByPrimaryKeySelective(mallBizPayment);
+
             // 更新订单状态
             updateOrderState(mallBizOrder);
         } else {
+            LOG.info("非待支付结算单取消结算 payTradeId:{}", mallBizPaymentOrder.getPayTradeId());
             // 支付成功才能退款
             if (ObjectUtils.notEqual(mallBizPaymentOrder.getPayState(), PaymentState.SUCCESS.getCode())) {
                 throw new RtMartMallException(RtMarkErrorCode.E5005);
@@ -18,6 +18,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import java.util.Objects;
+
 /**
  * @ClassName PayNotifyServiceImpl.java
  * @author dengwei
@@ -45,8 +47,8 @@ public class PayNotifyServiceImpl implements PayNotifyService {
     public void onEvent(PaymentResultBO event) {
         String tradeId = event.getTradeId();
         MallBizPayment mallBizPayment = mallBizPaymentService.getByPayTradeId(tradeId);
-        if (ObjectUtils.notEqual(mallBizPayment.getPayState(), PaymentState.PENDING.getCode())) {
-            LOG.info("paymentOnEvent payState not pending, paymentId: {}", mallBizPayment.getId());
+        if (Objects.equals(mallBizPayment.getPayState(), PaymentState.SUCCESS.getCode())) {
+            LOG.info("paymentOnEvent payState is success, paymentId: {}", mallBizPayment.getId());
             return;
         }
@@ -36,6 +36,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 /**
@@ -61,6 +63,9 @@ public abstract class AbstractSourceChannel {
     @Resource
     protected RabbitTemplate rabbitTemplate;
+    private static final ScheduledExecutorService SCHEDULER = Executors.newScheduledThreadPool(5,
+            Thread.ofVirtual().name("delay-cashier-channel-", 0).factory());
+
     /**
      * authLogin
      */
@@ -114,6 +119,7 @@ public abstract class AbstractSourceChannel {
         // notify other channel
         payCallBack(event, mallBizPayment);
+
         TaxMessage taxMessage = new TaxMessage();
         taxMessage.setPaymentId(mallBizPayment.getId());
         taxMessage.setType(TaxMessageType.ORDER_PAY.getCode());
@@ -211,8 +217,17 @@ public abstract class AbstractSourceChannel {
         if (Objects.equals(curPayState, PaymentState.FAILED.getCode())
                 && (mallBizPayment = mallBizPaymentService.getByPayTradeId(mallBizPayment.getPayTradeId())) != null
                 && Objects.equals(mallBizPayment.getPayState(), PaymentState.SUCCESS.getCode())) {
+            LOG.info("系统主动取消订单，撤销该笔交易，mallBizPayment:{}", JsonUtils.toJsonString(mallBizPayment));
             RefundCO refundCo = mallBizPayment.ofRefund();
-            mallBizRefundService.refund(refundCo);
+            SCHEDULER.schedule(() -> {
+                LOG.info("异步处理系统取消结算单支付成功后触发取消结算！refundCo：{}", JsonUtils.toJsonString(refundCo));
+                try {
+                    mallBizRefundService.refund(refundCo);
+                } catch (Exception e) {
+                    LOG.warn("系统主动取消订单失败，refundCo={}", JsonUtils.toJsonString(refundCo), e);
+                    throw new RtMartMallException(RtMarkErrorCode.E5000);
+                }
+            }, 2, TimeUnit.SECONDS);
         }
     }
@@ -28,7 +28,7 @@
         <result column="modified_time" jdbcType="TIMESTAMP" property="modifiedTime" />
     </resultMap>
     <sql id="Base_Column_List">
-        id, pay_trade_no, biz_order_id, order_id, trade_id, pay_trade_id, firm_id, mch_id, card_no,
+        id, pay_trade_no, biz_order_id, order_id, trade_id, user_code ,pay_trade_id, firm_id, mch_id, card_no,
     username, user_id, account_id, fund_account_id, open_id, pay_fee, pay_state, pay_time,
     channel_id, cashier_url, payment_callback, version, created_time, modified_time
     </sql>