From c994cb2b4a50647258a0109e756776f6659f8528 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 27 Nov 2025 15:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=81=93=E5=85=B7=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/app/command/propcoupon/PropCouponSendCmdExe.java | 1 + .../other/app/command/propcoupon/PropCouponUseCmdExe.java | 1 + .../red/circle/other/app/convertor/PropCouponConvertor.java | 3 +++ .../red/circle/other/app/dto/clientobject/PropCouponCO.java | 5 +++++ .../other/app/dto/clientobject/PropCouponRecordCO.java | 5 +++++ .../database/rds/entity/props/PropCouponUseRecordDO.java | 5 +++++ 6 files changed, 20 insertions(+) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponSendCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponSendCmdExe.java index da22a3e7..bc65544c 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponSendCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponSendCmdExe.java @@ -116,6 +116,7 @@ public class PropCouponSendCmdExe { recordDO.setPropIcon(propCoupon.getPropIcon()); recordDO.setPropName(propCoupon.getPropName()); recordDO.setValidDays(propCoupon.getValidDays()); + recordDO.setPropDays(propCoupon.getPropDays()); recordDO.setActionType(2); // 2-赠送 recordDO.setReceiverId(receiverId); recordDO.setRemark("用户赠送道具券"); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponUseCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponUseCmdExe.java index db47404b..db7dd94b 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponUseCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/propcoupon/PropCouponUseCmdExe.java @@ -288,6 +288,7 @@ public class PropCouponUseCmdExe { recordDO.setPropIcon(propCoupon.getPropIcon()); recordDO.setPropName(propCoupon.getPropName()); recordDO.setValidDays(propCoupon.getValidDays()); + recordDO.setPropDays(propCoupon.getPropDays()); recordDO.setActionType(1); // 1-使用 recordDO.setRemark("用户使用道具券"); recordDO.setCreateTime(LocalDateTime.now()); diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/PropCouponConvertor.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/PropCouponConvertor.java index 6bbe2adc..5ca57612 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/PropCouponConvertor.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/convertor/PropCouponConvertor.java @@ -39,6 +39,7 @@ public class PropCouponConvertor { co.setPropName(propCoupon.getPropName()); co.setPropIcon(propCoupon.getPropIcon()); co.setValidDays(propCoupon.getValidDays()); + co.setPropDays(propCoupon.getPropDays()); co.setStatus(propCoupon.getStatus().getCode()); co.setStatusName(propCoupon.getStatus().getDesc()); co.setSource(propCoupon.getSource().getCode()); @@ -75,6 +76,7 @@ public class PropCouponConvertor { co.setPropName(propCouponDO.getPropName()); co.setPropIcon(propCouponDO.getPropIcon()); co.setValidDays(propCouponDO.getValidDays()); + co.setPropDays(propCouponDO.getPropDays()); co.setStatus(propCouponDO.getStatus()); PropCouponStatus status = PropCouponStatus.getByCode(propCouponDO.getStatus()); @@ -118,6 +120,7 @@ public class PropCouponConvertor { co.setPropIcon(recordDO.getPropIcon()); co.setPropName(recordDO.getPropName()); co.setValidDays(recordDO.getValidDays()); + co.setPropDays(recordDO.getPropDays()); co.setActionType(recordDO.getActionType()); // 操作类型名称 diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponCO.java index fb6977bd..247ccaa9 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponCO.java @@ -55,6 +55,11 @@ public class PropCouponCO { */ private Integer validDays; + /** + * 道具时长 + */ + private Integer propDays; + /** * 券状态（0未使用 1已使用 2已过期 3已赠送） */ diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponRecordCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponRecordCO.java index ffe673d3..5b27bd86 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponRecordCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/PropCouponRecordCO.java @@ -56,6 +56,11 @@ public class PropCouponRecordCO { */ private Integer validDays; + /** + * 道具时长 + */ + private Integer propDays; + /** * 操作类型（1使用 2赠送） */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/props/PropCouponUseRecordDO.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/props/PropCouponUseRecordDO.java index f5ecb0d4..1c03c610 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/props/PropCouponUseRecordDO.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/props/PropCouponUseRecordDO.java @@ -58,6 +58,11 @@ public class PropCouponUseRecordDO { */ private Integer validDays; + /** + * 道具天数 + */ + private Integer propDays; + /** * 操作类型（1使用 2赠送） */