From 711a0740595440363fc02a9a46d25a9c6f1b7a6e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 14 Oct 2021 09:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pay/convert/package-info.java | 6 + ...‹é“ Spring Boot å¯¹è±¡è½¬æ¢ MapStruct 入门》.md | 1 + .../pay/dal/dataobject/merchant/PayAppDO.java | 57 ++++++ .../dal/dataobject/merchant/PayChannelDO.java | 55 ++++++ .../dataobject/merchant/PayMerchantDO.java | 46 +++++ .../pay/dal/dataobject/order/PayNotifyDO.java | 15 ++ .../pay/dal/dataobject/order/PayOrderDO.java | 167 ++++++++++++++++++ .../pay/dal/dataobject/order/PayRefundDO.java | 133 ++++++++++++++ .../pay/dal/dataobject/package-info.java | 1 + .../modules/pay/enums/PayChannelCodeEnum.java | 28 +++ .../adminserver/modules/pay/package-info.java | 7 + .../dataobject/logger/InfApiErrorLogDO.java | 2 + 12 files changed, 518 insertions(+) create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/package-info.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/ã€ŠèŠ‹é“ Spring Boot å¯¹è±¡è½¬æ¢ MapStruct 入门》.md create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayAppDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayChannelDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayMerchantDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayNotifyDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayOrderDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayRefundDO.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/package-info.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/enums/PayChannelCodeEnum.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/package-info.java new file mode 100644 index 000000000..da3973390 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/package-info.java @@ -0,0 +1,6 @@ +/** + * æä¾› POJO ç±»çš„å®žä½“è½¬æ¢ + * + * ç›®å‰ä½¿ç”¨ MapStruct 框架 + */ +package cn.iocoder.yudao.adminserver.modules.pay.convert; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/ã€ŠèŠ‹é“ Spring Boot å¯¹è±¡è½¬æ¢ MapStruct 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/ã€ŠèŠ‹é“ Spring Boot å¯¹è±¡è½¬æ¢ MapStruct 入门》.md new file mode 100644 index 000000000..8153487b7 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/ã€ŠèŠ‹é“ Spring Boot å¯¹è±¡è½¬æ¢ MapStruct 入门》.md @@ -0,0 +1 @@ + diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayAppDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayAppDO.java new file mode 100644 index 000000000..eefdca682 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayAppDO.java @@ -0,0 +1,57 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant; + +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * 支付应用 DO + * 一个商户下，å¯èƒ½ä¼šæœ‰å¤šä¸ªæ”¯ä»˜åº”用。例如说，京东有京东商城ã€äº¬ä¸œåˆ°å®¶ç­‰ç­‰ + * ä¸è¿‡ä¸€èˆ¬æ¥è¯´ï¼Œä¸€ä¸ªå•†æˆ·ï¼Œåªæœ‰ä¸€ä¸ªåº”用哈~ + * + * å³ PayMerchantDO : PayAppDO = 1 : n + * + * @author 芋é“æºç  + */ +@Data +public class PayAppDO extends BaseDO { + + /** + * 应用编å·ï¼Œæ•°æ®åº“自增 + */ + @TableId + private Long id; + /** + * åº”ç”¨å· + * 例如说，60cc81e0e4b06afc4d3f0cfq + */ + private String no; + /** + * 应用å + */ + private String name; + /** + * çŠ¶æ€ + * + * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + /** + * 应用ç§é’¥ + * TODO 芋艿：用途 + */ + private String secret; + + /** + * å•†æˆ·ç¼–å· + * + * å…³è” {@link PayMerchantDO#getId()} + */ + private Long merchantId; + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayChannelDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayChannelDO.java new file mode 100644 index 000000000..190debdab --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayChannelDO.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant; + +import cn.iocoder.yudao.adminserver.modules.pay.enums.PayChannelCodeEnum; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import lombok.Data; + +/** + * æ”¯ä»˜æ¸ é“ DO + * 一个应用下，会有多ç§æ”¯ä»˜æ¸ é“，例如说微信支付ã€æ”¯ä»˜å®æ”¯ä»˜ç­‰ç­‰ + * + * å³ PayAppDO : PayChannelDO = 1 : n + * + * @author 芋é“æºç  + */ +@Data +public class PayChannelDO extends BaseDO { + + /** + * 渠é“ç¼–å·ï¼Œæ•°æ®åº“自增 + */ + private Long id; + /** + * 渠é“ç¼–ç  + * + * 枚举 {@link PayChannelCodeEnum} + */ + private String code; + /** + * çŠ¶æ€ + * + * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + /** + * 渠é“费率，å•ä½ï¼šç™¾åˆ†æ¯” + */ + private Double feeRate; + + /** + * å•†æˆ·ç¼–å· + * + * å…³è” {@link PayMerchantDO#getId()} + */ + private Long merchantId; + /** + * åº”ç”¨ç¼–å· + * + * å…³è” {@link PayAppDO#getId()} + */ + private String appId; + + // TODO 芋艿：ä¸åŒæ¸ é“çš„é…ç½®ã€‚æš‚æ—¶è€ƒè™‘ç¡¬ç¼–ç  + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayMerchantDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayMerchantDO.java new file mode 100644 index 000000000..0d64d4c3a --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/merchant/PayMerchantDO.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant; + +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +/** + * å•†æˆ·ä¿¡æ¯ DO + * ç›®å‰æš‚时没有特别的用途，主è¦ä¸ºæœªæ¥å¤šå•†æˆ·æ供基础。 + * + * @author 芋é“æºç  + */ +@Data +public class PayMerchantDO extends BaseDO { + + /** + * 商户编å·ï¼Œæ•°æ®åº“自增 + */ + @TableId + private Long id; + /** + * å•†æˆ·å· + * 例如说，M233666999 + */ + private String no; + /** + * 商户全称 + */ + private String name; + /** + * 商户简称 + */ + private String shortName; + /** + * çŠ¶æ€ + * + * 枚举 {@link CommonStatusEnum} + */ + private Integer status; + /** + * 备注 + */ + private String remark; + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayNotifyDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayNotifyDO.java new file mode 100644 index 000000000..110e1a082 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayNotifyDO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.order; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import lombok.Data; + +/** + * 商户支付ã€é€€æ¬¾ç­‰çš„通知 + * 在支付系统收到支付渠é“的支付ã€é€€æ¬¾çš„结果åŽï¼Œéœ€è¦ä¸æ–­çš„通知到业务系统，直到æˆåŠŸã€‚ + * TODO 芋艿：待完善 + * + * @author 芋é“æºç  + */ +@Data +public class PayNotifyDO extends BaseDO { +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayOrderDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayOrderDO.java new file mode 100644 index 000000000..88c0012a9 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayOrderDO.java @@ -0,0 +1,167 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.order; + +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayAppDO; +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayChannelDO; +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayMerchantDO; +import cn.iocoder.yudao.adminserver.modules.pay.enums.PayChannelCodeEnum; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import lombok.Data; + +import java.util.Date; + +/** + * æ”¯ä»˜è®¢å• DO + * + * @author 芋é“æºç  + */ +@Data +public class PayOrderDO extends BaseDO { + + /** + * 订å•ç¼–å·ï¼Œæ•°æ®åº“自增 + */ + private Long id; + /** + * 订å•å·ï¼Œæ ¹æ®è§„åˆ™ç”Ÿæˆ + * + * 例如说，P202110132239124200055 + */ + private String no; + /** + * å•†æˆ·ç¼–å· + * + * å…³è” {@link PayMerchantDO#getId()} + */ + private Long merchantId; + /** + * åº”ç”¨ç¼–å· + * + * å…³è” {@link PayAppDO#getId()} + */ + private Long appId; + /** + * 渠é“ç¼–å· + * + * å…³è” {@link PayChannelDO#getMerchantId()} + */ + private Long channelId; + /** + * å•†æˆ·ç¼–ç  + * + * 枚举 {@link PayChannelCodeEnum} + */ + private String channelCode; + + // ========== 商户相关字段 ========== + + /** + * 商户订å•å· + * 例如说，内部系统 A 的订å•å·ã€‚需è¦ä¿è¯æ¯ä¸ª PayMerchantDO 唯一 TODO 芋艿：需è¦åœ¨æµ‹è¯•ä¸‹ + */ + private String merchantOrderNo; + /** + * 商å“标题 + */ + private String subject; + /** + * 商å“æè¿°ä¿¡æ¯ + */ + private String body; + /** + * 商户拓展å‚æ•° + */ + private String merchantExtra; + /** + * é€šçŸ¥å•†æˆ·æ”¯ä»˜ç»“æžœçš„å›žè°ƒçŠ¶æ€ + * TODO 芋艿：0 未å‘é€ 1 å·²å‘é€ + */ + private Integer notifyStatus; + + // ========== 订å•ç›¸å…³å­—段 ========== + + /** + * 支付金é¢ï¼Œå•ä½ï¼šåˆ† + */ + private Long amount; + /** + * 渠é“手续费 + * + * 冗余 {@link PayChannelDO#getFeeRate()} + */ + private Double channelFeeRate; + /** + * 渠é“æ‰‹ç»­é‡‘é¢ + */ + private Long channelFeeAmount; + /** + * æ”¯ä»˜çŠ¶æ€ + * + * TODO 芋艿：状æ€æžšä¸¾ + */ + private Integer status; + /** + * 客户端 IP + */ + private String clientIp; + /** + * 订å•æ”¯ä»˜æˆåŠŸæ—¶é—´ + */ + private Date successTime; + /** + * 订å•å¤±æ•ˆæ—¶é—´ + */ + private Date expiredTime; + /** + * 支付渠é“çš„é¢å¤–å‚æ•° + * + * å‚è§ https://www.pingxx.com/api/支付渠é“%20extra%20å‚数说明.html + */ + private String channelExtra; + /** + * å¼‚æ­¥é€šçŸ¥åœ°å€ + */ + private String notifyUrl; + /** + * 页é¢è·³è½¬åœ°å€ + */ + private String returnUrl; + + // TODO 芋艿：å¯èƒ½è¦ä¼˜åŒ– + /** + * 渠é“æ”¯ä»˜é”™è¯¯ç  + */ + private String errorCode; + /** + * 渠é“æ”¯ä»˜é”™è¯¯æ¶ˆæ¯ + */ + private String errorMessage; + + // ========== 退款相关字段 ========== + /** + * é€€æ¬¾çŠ¶æ€ + * + * TODO 芋艿：0 - 未退款；1 - 部分退款； 2 - å…¨é¢é€€æ¬¾ + */ + private Integer refundStatus; + /** + * 退款次数 + */ + private Integer refundTimes; + /** + * 退款总金é¢ï¼Œå•ä½ï¼šåˆ† + */ + private Long refundAmount; + + // ========== 渠é“相关字段 ========== + /** + * 渠é“ç”¨æˆ·ç¼–å· + * + * 例如说，微信 openidã€æ”¯ä»˜å®è´¦å· + */ + private String channelUserId; + /** + * 渠é“订å•å· + */ + private String channelOrderNo; + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayRefundDO.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayRefundDO.java new file mode 100644 index 000000000..375fee5b4 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/order/PayRefundDO.java @@ -0,0 +1,133 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.order; + +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayAppDO; +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayChannelDO; +import cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject.merchant.PayMerchantDO; +import cn.iocoder.yudao.adminserver.modules.pay.enums.PayChannelCodeEnum; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import lombok.Data; + +import java.util.Date; + +/** + * æ”¯ä»˜é€€æ¬¾å• DO + * 一个支付订å•ï¼Œå¯ä»¥æ‹¥æœ‰å¤šä¸ªæ”¯ä»˜é€€æ¬¾å• + * + * å³ PayOrderDO : PayRefundDO = 1 : n + * + * @author 芋é“æºç  + */ +@Data +public class PayRefundDO extends BaseDO { + + /** + * 退款å•ç¼–å·ï¼Œæ•°æ®åº“自增 + */ + private Long id; + /** + * 退款å•å·ï¼Œæ ¹æ®è§„åˆ™ç”Ÿæˆ + * + * 例如说，R202109181134287570000 + */ + private String no; + /** + * å•†æˆ·ç¼–å· + * + * å…³è” {@link PayMerchantDO#getId()} + */ + private Long merchantId; + /** + * åº”ç”¨ç¼–å· + * + * å…³è” {@link PayAppDO#getId()} + */ + private Long appId; + /** + * 渠é“ç¼–å· + * + * å…³è” {@link PayChannelDO#getMerchantId()} + */ + private Long channelId; + /** + * å•†æˆ·ç¼–ç  + * + * 枚举 {@link PayChannelCodeEnum} + */ + private String channelCode; + /** + * 订å•ç¼–å· + * + * å…³è” {@link PayOrderDO#getId()} + */ + private Long orderId; + + // ========== 商户相关字段 ========== + /** + * 商户退款订å•å· + * 例如说，内部系统 A 的退款订å•å·ã€‚需è¦ä¿è¯æ¯ä¸ª PayMerchantDO 唯一 TODO 芋艿：需è¦åœ¨æµ‹è¯•ä¸‹ + */ + private String merchantRefundNo; + /** + * 商户拓展å‚æ•° + */ + private String merchantExtra; + + // ========== 退款相关字段 ========== + /** + * é€€æ¬¾çŠ¶æ€ + * + * TODO 芋艿：状æ€æžšä¸¾ + */ + private Integer status; + /** + * 客户端 IP + */ + private String clientIp; + /** + * 退款金é¢ï¼Œå•ä½ï¼šåˆ† + */ + private Long amount; + /** + * 退款原因 + */ + private String reason; + /** + * 订å•é€€æ¬¾æˆåŠŸæ—¶é—´ + */ + private Date successTime; + /** + * 退款失效时间 + */ + private Date expiredTime; + /** + * 支付渠é“çš„é¢å¤–å‚æ•° + * + * å‚è§ https://www.pingxx.com/api/Refunds%20退款概述.html + */ + private String channelExtra; + /** + * å¼‚æ­¥é€šçŸ¥åœ°å€ + */ + private String notifyUrl; + + // TODO 芋艿：å¯èƒ½è¦ä¼˜åŒ– + /** + * 渠é“æ”¯ä»˜é”™è¯¯ç  + */ + private String errorCode; + /** + * 渠é“æ”¯ä»˜é”™è¯¯æ¶ˆæ¯ + */ + private String errorMessage; + + // ========== 渠é“相关字段 ========== + /** + * 渠é“订å•å· + */ + private String channelOrderNo; + /** + * 渠é“é€€æ¬¾å· + */ + private String channelRefundNo; + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/package-info.java new file mode 100644 index 000000000..b89b77f7e --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/dal/dataobject/package-info.java @@ -0,0 +1 @@ +package cn.iocoder.yudao.adminserver.modules.pay.dal.dataobject; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/enums/PayChannelCodeEnum.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/enums/PayChannelCodeEnum.java new file mode 100644 index 000000000..5a1140eb1 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/enums/PayChannelCodeEnum.java @@ -0,0 +1,28 @@ +package cn.iocoder.yudao.adminserver.modules.pay.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 支付渠é“çš„ç¼–ç çš„枚举 + * + * @author 芋é“æºç  + */ +@Getter +@AllArgsConstructor +public enum PayChannelCodeEnum { + + wx_pub("wx_pub", "微信 JSAPI 支付"); + + /** + * ç¼–ç  + * + * å‚考 https://www.pingxx.com/api/支付渠é“属性值.html + */ + private String code; + /** + * åå­— + */ + private String name; + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/package-info.java new file mode 100644 index 000000000..a113b9beb --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/package-info.java @@ -0,0 +1,7 @@ +/** + * pay 包下，我们放支付业务，æ供业务的支付能力。 + * 例如说：商户ã€åº”用ã€æ”¯ä»˜ã€é€€æ¬¾ç­‰ç­‰ + * + * 缩写：pay + */ +package cn.iocoder.yudao.adminserver.modules.pay; diff --git a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java index 114ebf23a..4cd4ebf40 100644 --- a/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java +++ b/yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/infra/dal/dataobject/logger/InfApiErrorLogDO.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.coreservice.modules.infra.dal.dataobject.logger; import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.coreservice.modules.infra.enums.logger.InfApiErrorLogProcessStatusEnum; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; @@ -25,6 +26,7 @@ public class InfApiErrorLogDO extends BaseDO { /** * ç¼–å· */ + @TableId private Long id; /** * 用户编å·