feat(transaction): 为实体类添加逻辑删除注解并优化订单查询逻辑
- 在 Divide、DivideRule 和 PayOrder 类中,为 delFlag 字段添加 @TableLogic 注解 - 优化 EasypayServiceImpl 中的 paymentQuery 方法,增加对 payOrder 为空的处理
This commit is contained in:
parent
15690ac810
commit
2fe6800ac3
@ -3,6 +3,7 @@ package com.wzj.soopin.transaction.domain.po;
|
|||||||
|
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
@ -90,6 +91,7 @@ public class Divide extends BaseEntity {
|
|||||||
@ExcelProperty(value = "订单编号", order = 9)
|
@ExcelProperty(value = "订单编号", order = 9)
|
||||||
private String orderSn;
|
private String orderSn;
|
||||||
|
|
||||||
|
@TableLogic
|
||||||
private String delFlag;
|
private String delFlag;
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ package com.wzj.soopin.transaction.domain.po;
|
|||||||
|
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.wzj.soopin.transaction.enums.DivideRuleFeeType;
|
import com.wzj.soopin.transaction.enums.DivideRuleFeeType;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
@ -67,6 +68,7 @@ public class DivideRule extends BaseEntity {
|
|||||||
@ExcelProperty(value ="类型", order = 8)
|
@ExcelProperty(value ="类型", order = 8)
|
||||||
private Integer type;
|
private Integer type;
|
||||||
|
|
||||||
|
@TableLogic
|
||||||
private String delFlag;
|
private String delFlag;
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ package com.wzj.soopin.transaction.domain.po;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@ -96,6 +97,6 @@ public class PayOrder extends BaseAudit {
|
|||||||
@Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款")
|
@Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款")
|
||||||
private Integer transState;
|
private Integer transState;
|
||||||
|
|
||||||
@TableField(value = "del_flag")
|
@TableLogic
|
||||||
private String delFlag;
|
private String delFlag;
|
||||||
}
|
}
|
||||||
|
@ -397,14 +397,16 @@ public class EasypayServiceImpl implements IEasypayService {
|
|||||||
public EasypayTransResultVO paymentQuery(Long orderId) throws ServerException {
|
public EasypayTransResultVO paymentQuery(Long orderId) throws ServerException {
|
||||||
Order order = orderMapper.selectById(orderId);
|
Order order = orderMapper.selectById(orderId);
|
||||||
Assert.notNull(order, () -> new ServiceException("订单不存在"));
|
Assert.notNull(order, () -> new ServiceException("订单不存在"));
|
||||||
PayOrder payOrder = payOrderMapper.selectById(order.getPayId());
|
|
||||||
Assert.notNull(payOrder, () -> new ServiceException("订单不存在"));
|
|
||||||
EasypayTransResultVO paymentResultVO = EasypayTransResultVO.builder()
|
EasypayTransResultVO paymentResultVO = EasypayTransResultVO.builder()
|
||||||
.orderId(order.getId())
|
.orderId(order.getId())
|
||||||
.payId(order.getPayId())
|
.payId(order.getPayId())
|
||||||
.totalAmount(order.getTotalAmount())
|
.totalAmount(order.getTotalAmount())
|
||||||
.transState(TransState.PENDING.getCode())
|
.transState(TransState.PENDING.getCode())
|
||||||
.build();
|
.build();
|
||||||
|
PayOrder payOrder = payOrderMapper.selectById(order.getPayId());
|
||||||
|
if(payOrder == null){
|
||||||
|
return paymentResultVO;
|
||||||
|
}
|
||||||
EasyPayRequestHeader reqHeader = generateEasyPayRequestHeader();
|
EasyPayRequestHeader reqHeader = generateEasyPayRequestHeader();
|
||||||
TradeQueryReqBody queryReqBody = TradeQueryReqBody.builder()
|
TradeQueryReqBody queryReqBody = TradeQueryReqBody.builder()
|
||||||
.reqInfo(ReqInfo.builder().mchtCode(easypayConfig.getMchtCode()).build())
|
.reqInfo(ReqInfo.builder().mchtCode(easypayConfig.getMchtCode()).build())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user