Explorar o código

feat: 会员等级实体/DTO增加原价字段, 升级记录增加审批字段

Xiaogang Liao hai 1 mes
pai
achega
34ed5ce27d

+ 3 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/MembershipLevelDTO.java

@@ -12,6 +12,9 @@ public class MembershipLevelDTO {
     private Integer priceMonthly;
     private Integer priceQuarterly;
     private Integer priceYearly;
+    private Integer originalPriceMonthly;
+    private Integer originalPriceQuarterly;
+    private Integer originalPriceYearly;
     private String features;
     private Integer maxChildren;
     private Integer maxTasksPerDay;

+ 8 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/MemberUpgradeRecord.java

@@ -29,5 +29,13 @@ public class MemberUpgradeRecord implements Serializable {
 
     private Date expireTime;
 
+    private String approveRemark;  // 审批备注(LIFETIME 授予注明,复用 approve_remark 列)
+
+    private String approveStatus;  // 审批状态: approved/rejected
+
+    private Long approveUserId;  // 审批人ID
+
+    private Date approveTime;  // 审批时间
+
     private Date createdAt;
 }

+ 6 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/MembershipLevel.java

@@ -27,6 +27,12 @@ public class MembershipLevel implements Serializable {
 
     private Integer priceYearly;  // 年费(分)
 
+    private Integer originalPriceMonthly;  // 原价-月费(分)
+
+    private Integer originalPriceQuarterly;  // 原价-季费(分)
+
+    private Integer originalPriceYearly;  // 原价-年费(分)
+
     private String features;  // 功能权限列表(JSON)
 
     private Integer maxChildren;  // 可添加孩子数量

+ 3 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/MembershipService.java

@@ -1042,6 +1042,9 @@ public class MembershipService implements MembershipServiceInterface {
         dto.setPriceMonthly(level.getPriceMonthly());
         dto.setPriceYearly(level.getPriceYearly());
         dto.setPriceQuarterly(level.getPriceQuarterly());
+        dto.setOriginalPriceMonthly(level.getOriginalPriceMonthly());
+        dto.setOriginalPriceQuarterly(level.getOriginalPriceQuarterly());
+        dto.setOriginalPriceYearly(level.getOriginalPriceYearly());
         dto.setFeatures(level.getFeatures());
         dto.setMaxChildren(level.getMaxChildren());
         dto.setMaxTasksPerDay(level.getMaxTasksPerDay());