From 2fe6800ac328c23cd1d90df449d63f078c836e0b Mon Sep 17 00:00:00 2001 From: huk Date: Thu, 4 Sep 2025 17:41:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(transaction):=20=E4=B8=BA=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=B3=A8=E8=A7=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 Divide、DivideRule 和 PayOrder 类中，为 delFlag 字段添加 @TableLogic 注解 - 优化 EasypayServiceImpl 中的 paymentQuery 方法，增加对 payOrder 为空的处理 --- .../java/com/wzj/soopin/transaction/domain/po/Divide.java | 2 ++ .../com/wzj/soopin/transaction/domain/po/DivideRule.java | 2 ++ .../java/com/wzj/soopin/transaction/domain/po/PayOrder.java | 3 ++- .../soopin/transaction/service/impl/EasypayServiceImpl.java | 6 ++++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java index 61ce75a42..e9da2d720 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java @@ -3,6 +3,7 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; @@ -90,6 +91,7 @@ public class Divide extends BaseEntity { @ExcelProperty(value = "订单编号", order = 9) private String orderSn; + @TableLogic private String delFlag; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java index b3d30461e..569206e58 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java @@ -3,6 +3,7 @@ package com.wzj.soopin.transaction.domain.po; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.wzj.soopin.transaction.enums.DivideRuleFeeType; import io.swagger.v3.oas.annotations.media.Schema; @@ -67,6 +68,7 @@ public class DivideRule extends BaseEntity { @ExcelProperty(value ="类型", order = 8) private Integer type; + @TableLogic private String delFlag; diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java index b7b99a1c3..67fc1958b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java @@ -2,6 +2,7 @@ package com.wzj.soopin.transaction.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Date; @@ -96,6 +97,6 @@ public class PayOrder extends BaseAudit { @Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款") private Integer transState; - @TableField(value = "del_flag") + @TableLogic private String delFlag; } diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java index d2624b51c..2239a0ecf 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java @@ -397,14 +397,16 @@ public class EasypayServiceImpl implements IEasypayService { public EasypayTransResultVO paymentQuery(Long orderId) throws ServerException { Order order = orderMapper.selectById(orderId); Assert.notNull(order, () -> new ServiceException("订单不存在")); - PayOrder payOrder = payOrderMapper.selectById(order.getPayId()); - Assert.notNull(payOrder, () -> new ServiceException("订单不存在")); EasypayTransResultVO paymentResultVO = EasypayTransResultVO.builder() .orderId(order.getId()) .payId(order.getPayId()) .totalAmount(order.getTotalAmount()) .transState(TransState.PENDING.getCode()) .build(); + PayOrder payOrder = payOrderMapper.selectById(order.getPayId()); + if(payOrder == null){ + return paymentResultVO; + } EasyPayRequestHeader reqHeader = generateEasyPayRequestHeader(); TradeQueryReqBody queryReqBody = TradeQueryReqBody.builder() .reqInfo(ReqInfo.builder().mchtCode(easypayConfig.getMchtCode()).build())