From 07df3682ea7b34a4578a6f0b90f9824f1bb763a8 Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 5 Sep 2025 12:51:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(common):=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B3=A8=E5=85=A5=E5=BC=82=E5=B8=B8=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了 InjectionMetaObjectHandler 中的自动注入异常 - 优化了 Order 和 PayOrder 实体类的代码结构 --- .../mybatis/handler/InjectionMetaObjectHandler.java | 2 +- .../com/wzj/soopin/order/domain/entity/Order.java | 8 +------- .../controller/TransEasypayController.java | 1 - .../wzj/soopin/transaction/domain/po/PayOrder.java | 10 +++++----- .../service/impl/EasypayServiceImpl.java | 13 ++----------- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java index 97d7428b6..f5eb3fbe7 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -52,12 +52,12 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { } else if(ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseAudit baseAudit) { baseAudit.setCreateTime(LocalDateTime.now()); baseAudit.setUpdateTime(LocalDateTime.now()); - }else{ Date date = new Date(); this.strictInsertFill(metaObject, "createTime", Date.class, date); this.strictInsertFill(metaObject, "updateTime", Date.class, date); } + this.strictInsertFill(metaObject, "delFlag", String.class, "0"); } catch (Exception e) { throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED); } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java index f9f795336..8cc0a81ee 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/Order.java @@ -1,10 +1,7 @@ package com.wzj.soopin.order.domain.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.persistence.PrePersist; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,10 +10,7 @@ import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.excel.annotation.Excel; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; -import java.util.Date; -import java.util.Random; /** * 订单表对象 oms_order diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/TransEasypayController.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/TransEasypayController.java index 24399b219..b9840f4be 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/TransEasypayController.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/controller/TransEasypayController.java @@ -2,7 +2,6 @@ package com.wzj.soopin.transaction.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.wzj.soopin.transaction.domain.bo.PaymentBO; -import com.wzj.soopin.transaction.domain.bo.SeparateApplyBO; import com.wzj.soopin.transaction.domain.bo.easypay.EasyPayRequest; import com.wzj.soopin.transaction.domain.vo.EasypayTransResultVO; import com.wzj.soopin.transaction.domain.vo.EasypayPrePayVO; 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 67fc1958b..3809c289f 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 @@ -1,13 +1,11 @@ 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 com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; import java.util.Date; import lombok.*; +import org.apache.ibatis.type.JdbcType; import org.dromara.common.core.domain.model.BaseAudit; /** @@ -97,6 +95,8 @@ public class PayOrder extends BaseAudit { @Schema(description = "交易状态 0->待支付,1->支付中,2->已支付,3->退款中,4->已退款") private Integer transState; - @TableLogic + + @TableLogic(value = "0", delval = "1") + @TableField(value = "del_flag", fill = FieldFill.INSERT, jdbcType = JdbcType.CHAR) 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 19eda63ce..4d322fc5d 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 @@ -244,8 +244,6 @@ public class EasypayServiceImpl implements IEasypayService { .payId(payOrder.getId()) .status(OrderStatusEnum.PAYMENT.getValue()) .build()); - // 产生待分账记录 - generateDivideRecord(payOrder); // 生成返回前端的预支付信息 return generatePrePayVO(paymentBO.getPayType(), jsApiRespBody); } else { @@ -262,14 +260,7 @@ public class EasypayServiceImpl implements IEasypayService { } } - /** - * 生成待分账记录 - * - * @param payOrder - */ - private void generateDivideRecord(PayOrder payOrder) { - //TODO 待完善 - } + /** * 根据支付类型校验请求参数是否完整 @@ -514,7 +505,7 @@ public class EasypayServiceImpl implements IEasypayService { payOrderMapper.updateById(PayOrder.builder().id(payOrder.getId()).transState(TransState.PENDING.getCode()).build()); } } else { - log.warn("回调通知的支付订单不存在:{}", respOrderInfo.getOrgTrace()); + log.warn("回调通知的订单不存在:{}", respOrderInfo.getOrgTrace()); } } else { log.warn("回调通知的支付订单不存在:{}", respOrderInfo.getOrgTrace());