abu/wzj-boot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(transaction): 为实体类添加逻辑删除注解并优化订单查询逻辑

Browse Source 
- 在 Divide、DivideRule 和 PayOrder 类中，为 delFlag 字段添加 @TableLogic 注解
- 优化 EasypayServiceImpl 中的 paymentQuery 方法，增加对 payOrder 为空的处理
This commit is contained in:
huk 2025-09-04 17:41:49 +08:00
parent 15690ac810
commit 2fe6800ac3
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/Divide.java
View File

@ -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;

2
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/DivideRule.java
View File

@ -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;

3
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/domain/po/PayOrder.java
View File

@ -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;
}

6
ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/service/impl/EasypayServiceImpl.java
View File

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