From 6e4105c598dfbe848fdea667553f91e418814785 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sat, 24 May 2025 17:34:28 +0800 Subject: [PATCH] //activity v.2 --- .../com/iformall/domain/po/WxVtwoActivityGrant.java | 11 +++++++++++ .../com/iformall/domain/po/WxVtwoActivityOrder.java | 6 ++++++ .../domain/po/WxVtwoSpecialTopicActivity.java | 10 ++++++++++ .../impl/WxVtwoActivitySpecialTopicServiceImpl.java | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java index 9f715896f..8f2b74e98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityGrant.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; /** @@ -123,4 +125,13 @@ public class WxVtwoActivityGrant extends TenantEntity { */ @TableField(value = "update_date") private Date updateDate; + + @TableField(exist = false) + private List orderIdList; + + @TableField(exist = false) + private List orderFilterIdList; + + @TableField(exist = false) + private List orderList; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java index fa56f2f35..de8caf6f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoActivityOrder.java @@ -251,4 +251,10 @@ public class WxVtwoActivityOrder extends TenantEntity { @TableField(exist = false) private Long activityId; + + /** + * 是否参与总金额计算 + */ + @TableField(exist = false) + private Integer isAmount; } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoSpecialTopicActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoSpecialTopicActivity.java index 6bc020cab..9f37ff1e8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoSpecialTopicActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxVtwoSpecialTopicActivity.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import java.util.Date; + +import com.iformall.enums.EnumOfflineActivityType; import lombok.Data; /** @@ -38,6 +40,14 @@ public class WxVtwoSpecialTopicActivity extends TenantEntity { */ @TableField(value = "activity_type") private Integer activityType; + @TableField(exist = false) + private String activityTypeName; + public String getActivityTypeName() { + if (null != activityType) { + return EnumOfflineActivityType.getEnum(activityType).getMessage(); + } + return null; + } /** * 活动名称 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java index 077f8ceda..7c5cec228 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivitySpecialTopicServiceImpl.java @@ -130,7 +130,7 @@ public class WxVtwoActivitySpecialTopicServiceImpl extends ServiceImpl activityList = wxVtwoSpecialTopicActivityMapper.findList(specialTopicActivityQ); specialTopic.setActivityList(activityList);