| @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import java.math.BigDecimal; | import java.math.BigDecimal; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| /** | /** | ||||
| @@ -123,4 +125,13 @@ public class WxVtwoActivityGrant extends TenantEntity { | |||||
| */ | */ | ||||
| @TableField(value = "update_date") | @TableField(value = "update_date") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @TableField(exist = false) | |||||
| private List<Long> orderIdList; | |||||
| @TableField(exist = false) | |||||
| private List<Long> orderFilterIdList; | |||||
| @TableField(exist = false) | |||||
| private List<WxVtwoActivityOrder> orderList; | |||||
| } | } | ||||
| @@ -251,4 +251,10 @@ public class WxVtwoActivityOrder extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long activityId; | private Long activityId; | ||||
| /** | |||||
| * 是否参与总金额计算 | |||||
| */ | |||||
| @TableField(exist = false) | |||||
| private Integer isAmount; | |||||
| } | } | ||||
| @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import com.iformall.enums.EnumOfflineActivityType; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| /** | /** | ||||
| @@ -38,6 +40,14 @@ public class WxVtwoSpecialTopicActivity extends TenantEntity { | |||||
| */ | */ | ||||
| @TableField(value = "activity_type") | @TableField(value = "activity_type") | ||||
| private Integer activityType; | private Integer activityType; | ||||
| @TableField(exist = false) | |||||
| private String activityTypeName; | |||||
| public String getActivityTypeName() { | |||||
| if (null != activityType) { | |||||
| return EnumOfflineActivityType.getEnum(activityType).getMessage(); | |||||
| } | |||||
| return null; | |||||
| } | |||||
| /** | /** | ||||
| * 活动名称 | * 活动名称 | ||||
| @@ -130,7 +130,7 @@ public class WxVtwoActivitySpecialTopicServiceImpl extends ServiceImpl<WxVtwoAct | |||||
| } | } | ||||
| WxVtwoSpecialTopicActivity specialTopicActivityQ = new WxVtwoSpecialTopicActivity(); | WxVtwoSpecialTopicActivity specialTopicActivityQ = new WxVtwoSpecialTopicActivity(); | ||||
| specialTopicActivityQ.setTenantId(tenantId); | |||||
| specialTopicActivityQ.updateTenantInfo(specialTopic); | |||||
| specialTopicActivityQ.setSpecialTopicId(id); | specialTopicActivityQ.setSpecialTopicId(id); | ||||
| List<WxVtwoSpecialTopicActivity> activityList = wxVtwoSpecialTopicActivityMapper.findList(specialTopicActivityQ); | List<WxVtwoSpecialTopicActivity> activityList = wxVtwoSpecialTopicActivityMapper.findList(specialTopicActivityQ); | ||||
| specialTopic.setActivityList(activityList); | specialTopic.setActivityList(activityList); | ||||