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())