vip定制课

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/RewardTypeEnum.java

@@ -16,6 +16,7 @@ public enum RewardTypeEnum implements BaseEnum<String, RewardTypeEnum> {
     SVIP("小酷AISVIP会员"),
     PIANO_ROOM("琴房时长"),
     COUPON("优惠券"),
+    DISCOUNT("畅学卡"),
     ;
 
     @EnumValue

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityPlanDto.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlanStandard;
@@ -59,6 +60,8 @@ public class ActivityPlanDto extends ActivityPlan {
 		private UnitEnum unit; // 更新奖品会员类型
 		private Integer status;
 		private Double discountPrice; // 更新优惠价格
+		private Long vipCardId; // 会员卡ID
+		private Boolean hideFlag = false;
 
 		public Long getActivityId() {
 			return activityId;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/OrderSearch.java

@@ -22,7 +22,7 @@ public class OrderSearch extends QueryInfo{
 	@ApiModelProperty("下单应用：STUDENT 学生端 TEACHER 老师端")
 	private String orderClient;
 
-	@ApiModelProperty("交易类型:  VIP、开通会员  SVIP、开通会员 PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）、VIP_COURSE VIP定制课")
+	@ApiModelProperty("交易类型:  VIP、开通会员  SVIP、开通会员 PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播 ACTI_REGIST、活动报名（多选用,分割）、VIP_COURSE VIP定制课、DISCOUNT 畅学卡")
 	private String orderType;
 
 	@ApiModelProperty("订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭 FAIL 支付失败 （多选用,分割）")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityReward.java

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.common.enums.RewardTypeEnum;
 import com.yonge.cooleshow.common.enums.UnitEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -24,6 +25,7 @@ import java.util.Date;
  */
 @TableName("activity_reward")
 @ApiModel(value = "ActivityReward对象", description = "活动奖品表")
+@Data
 public class ActivityReward implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -96,147 +98,11 @@ public class ActivityReward implements Serializable {
     @TableField(exist = false)
     private String group;
 
-    public BigDecimal getDiscountPrice() {
-        return discountPrice;
-    }
+    @ApiModelProperty("会员卡ID")
+    @TableField(value = "vip_card_id_")
+    private Long vipCardId;
 
-    public void setDiscountPrice(BigDecimal discountPrice) {
-        this.discountPrice = discountPrice;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-
-    public String getRewardClient() {
-        return rewardClient;
-    }
-
-    public void setRewardClient(String rewardClient) {
-        this.rewardClient = rewardClient;
-    }
-
-    public String getRewardName() {
-        return rewardName;
-    }
-
-    public void setRewardName(String rewardName) {
-        this.rewardName = rewardName;
-    }
-
-    public RewardTypeEnum getRewardType() {
-        return rewardType;
-    }
-
-    public void setRewardType(RewardTypeEnum rewardType) {
-        this.rewardType = rewardType;
-    }
-
-    public String getRewardDescribe() {
-        return rewardDescribe;
-    }
-
-    public void setRewardDescribe(String rewardDescribe) {
-        this.rewardDescribe = rewardDescribe;
-    }
-
-    public String getImgUrl() {
-        return imgUrl;
-    }
-
-    public void setImgUrl(String imgUrl) {
-        this.imgUrl = imgUrl;
-    }
-
-    public Integer getStock() {
-        return stock;
-    }
-
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public UnitEnum getUnit() {
-        return unit;
-    }
-
-    public void setUnit(UnitEnum unit) {
-        this.unit = unit;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    public Long getCouponId() {
-        return couponId;
-    }
-
-    public void setCouponId(Long couponId) {
-        this.couponId = couponId;
-    }
+    @ApiModelProperty("隐藏标记")
+    @TableField(value = "hide_flag_")
+    private Boolean hideFlag = false;
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OrderTypeEnum.java

@@ -21,6 +21,7 @@ public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
     ALBUM("专辑购买"),
     TENANT_ALBUM("平台专辑"),
     VIP_COURSE("VIP定制课"),
+    DISCOUNT("畅学卡")
     ;
     @EnumValue
     private String code;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/coupon/CouponCategoryEnum.java

@@ -25,6 +25,7 @@ public enum CouponCategoryEnum implements BaseEnum<String, CouponCategoryEnum> {
     LIVE("直播课购买券", "LIVE"),
     VIDEO("视频课购买券", "VIDEO"),
     VIP_COURSE("VIP定制课购买券", "VIP_COURSE"),
+    DISCOUNT("畅学卡","DISCOUNT"),
     ;
 
     @EnumValue

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -344,6 +344,9 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         for (ActivityPlanDto.RewardItem item : activityPlan.getRewardItems()) {
             // 更新活动ID
             item.setActivityId(activityId);
+            if(activityPlan.getActivityType() == ActivityTypeEnum.MEMBER){
+                item.setHideFlag(true);
+            }
         }
 
         List<Long> deleteRewardIds = activityPlanRewardService.getBaseMapper()

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardMapper.xml

@@ -19,6 +19,8 @@
         <result column="update_time_" property="updateTime" />
         <result column="update_by_" property="updateBy" />
         <result column="discount_price_" property="discountPrice" />
+        <result column="vip_card_id_" property="vipCardId" />
+        <result column="hide_flag_" property="hideFlag" />
     </resultMap>
 
     <!-- 表字段 -->
@@ -40,6 +42,8 @@
         , t.update_time_ as updateTime
         , t.update_by_ as updateBy
         , t.discount_price_   as discountPrice
+        , t.vip_card_id_ as vipCardId
+        , t.hide_flag_ as hideFlag
     </sql>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo">
@@ -114,7 +118,8 @@
         <result column="update_time_" property="updateTime" />
         <result column="update_by_" property="updateBy" />
         <result column="discount_price_" property="discountPrice" />
-
+        <result column="vip_card_id_" property="vipCardId" />
+        <result column="hide_flag_" property="hideFlag" />
         <result column="group_" property="group" />
     </resultMap>
     <select id="getActivityReward" resultMap="ActivityRewardResultMap">