Merge branch 'fix_2026-03-11' into dev

邓伟
2 parents 9be95270 2102e09c
Showing 7 changed files with 84 additions and 7 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallScanOrderApi.java
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/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);
@@ -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;
@@ -139,6 +140,11 @@ public class MallBizPayment extends BaseDO {
         this.tradeId = tradeId;
     }
  
+    public MallBizPayment(Long id, Integer payState) {
+        this.id = id;
+        this.payState = payState;
+    }
+
     /**
      * of
      */
@@ -379,4 +385,14 @@ 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.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);
@@ -121,7 +131,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());
@@ -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;
         }
  
@@ -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,11 @@ 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.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
  
 /**
@@ -58,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
      */
@@ -99,6 +107,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);
@@ -108,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());
@@ -115,6 +127,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 +210,28 @@ 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())) {
+            LOG.info("系统主动取消订单，撤销该笔交易，mallBizPayment:{}", JsonUtils.toJsonString(mallBizPayment));
+            RefundCO refundCo = mallBizPayment.ofRefund();
+            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);
+        }
+    }
+
+    /**
      * 渠道
      */
     public abstract Integer source();
@@ -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>