fix:merge

.gitignore

@@ -1,4 +1,5 @@
 /target/
+logback-test.xml
 
 ### STS ###
 .apt_generated

audio-analysis/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.yonge" level="debug" />
+	<logger name="com.yonge" level="info" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="local">

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

@@ -0,0 +1,35 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 活动资源类型
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum ActivityResourceEnum implements BaseEnum<String, ActivityResourceEnum> {
+
+    MUSIC_SHEET("曲谱"),
+    TEACHER("老师"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ActivityResourceEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * 活动分类类型
+ *
+ * @Author: liweifan
+ * @Data: 2022/4/7 15:48
+ */
+public enum ActivityShareEnum implements BaseEnum<String, ActivityShareEnum> {
+
+    MUSIC_SHEET("曲谱"),
+    MUSIC("音乐"),
+    VIP("会员"),
+    VIDEO("视频"),
+    LIVE("直播"),
+    GOODS("商品"),
+    DEFAULT("默认"),
+    ;
+
+    @EnumValue
+    private String code;
+    private String msg;
+
+    ActivityShareEnum(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

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

@@ -13,6 +13,7 @@ public enum ActivityTypeEnum implements BaseEnum<String, ActivityTypeEnum> {
 
     EVALUATION("评测活动"),
     STANDARD_GIFT("达标赠送"),
+    SHARE("活动分享"),
     ;
 
     @EnumValue

cooleshow-mall/mall-portal/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.yonge" level="INFO" />
+	<logger name="com.yonge" level="info" />
 
 	<!--本地环境:打印控制台 -->
 	<springProfile name="local">

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -1,5 +1,26 @@
 package com.yonge.cooleshow.admin.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
@@ -12,7 +33,10 @@ import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.*;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -20,27 +44,23 @@ import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetStudentByMessage;
+import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
+import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.BizHttpStatus;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.base.util.StringUtil;
+import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.utils.easyexcel.ErrMsg;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReader;
 import com.yonge.toolset.utils.easyexcel.ExcelException;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 曲谱表 web 控制层

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/VideoLessonController.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.VideoGroupSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.VideoLessonSearch;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroup;
 import com.yonge.cooleshow.biz.dal.entity.VideoLessonGroupDetail;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupDetailService;
 import com.yonge.cooleshow.biz.dal.service.VideoLessonGroupService;
 import com.yonge.toolset.base.util.StringUtil;
@@ -177,6 +178,7 @@ public class VideoLessonController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+        shelvesVo.setClientType(ClientEnum.SYSTEM);
         lessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/ActivityTeacherInfoRequest.java

@@ -0,0 +1,11 @@
+package com.yonge.cooleshow.admin.io.request;
+
+import java.io.Serializable;
+
+/**
+ * 分享活动参与老师信息请求
+ * <p>
+ * Created by Eric.Shang on 2022/8/29.
+ */
+public class ActivityTeacherInfoRequest implements Serializable {
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/response/ActivityTeacherResponse.java

@@ -0,0 +1,11 @@
+package com.yonge.cooleshow.admin.io.response;
+
+import java.io.Serializable;
+
+/**
+ * 分享活动参与老师信息响应
+ * <p>
+ * Created by Eric.Shang on 2022/8/29.
+ */
+public class ActivityTeacherResponse implements Serializable {
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ActivityPlanDao.java

@@ -55,9 +55,18 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan> {
 
 	/**
 	 * 查询需要变更状态的活动
+	 *
 	 * @return
 	 */
     List<ActivityPlan> activityState();
 
 
+	/**
+	 * 获取用户参与的分享活动
+	 *
+	 * @param type   活动分享类型
+	 * @param userId 用户id
+	 * @return
+	 */
+	ActivityPlanVo selectActivityShare(@Param("type") String type, @Param("userId") Long userId);
 }

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

@@ -42,6 +42,9 @@ public class OrderReq {
     private Long couponId;
     @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
     private Long recomUserId;
+
+    @ApiModelProperty(value = "活动id",hidden = true)
+    private Long activityId;
     @NotNull(message = "订单金额不能为空")
     @ApiModelProperty(value = "订单金额", required = true)
     private BigDecimal actualPrice;
@@ -232,4 +235,12 @@ public class OrderReq {
     public void setRecomUserId(Long recomUserId) {
         this.recomUserId = recomUserId;
     }
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
@@ -9,9 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.Date;
 
 /**

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -11,4 +12,14 @@ import io.swagger.annotations.ApiModel;
 public class MemberPriceSettingsSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("分享老师id")
+	private Long userId;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yonge.cooleshow.common.enums.ActivityResourceEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -28,6 +29,11 @@ public class ActivityEvaluation implements Serializable {
     @ApiModelProperty("曲目id ")
     @TableField(value = "music_sheet_id_")
     private Long musicSheetId;
+
+    @ApiModelProperty("资源类型 ")
+    @TableField(value = "resource_type_")
+    private ActivityResourceEnum resourceType;
+
     @ApiModelProperty("创建时间 ")
     @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -37,6 +43,14 @@ public class ActivityEvaluation implements Serializable {
     @TableField(value = "create_by_")
     private Long createBy;
 
+    public ActivityResourceEnum getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(ActivityResourceEnum resourceType) {
+        this.resourceType = resourceType;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -31,6 +31,11 @@ public class ActivityEvaluationRecord implements Serializable {
     @ApiModelProperty("评测活动id ")
     @TableField(value = "evaluation_id_")
     private Long evaluationId;
+
+    @ApiModelProperty("活动内容资源ID ")
+    @TableField(value = "resource_id_")
+    private Long resourceId;
+
     @ApiModelProperty("分数 ")
     @TableField(value = "score_")
     private Double score;
@@ -40,6 +45,14 @@ public class ActivityEvaluationRecord implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -4,22 +4,21 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Optional;
 
 /**
  * 活动计划表
@@ -92,6 +91,9 @@ public class ActivityPlan implements Serializable {
     @ApiModelProperty("发奖状态（完成状态） 0 未发奖 1 已发奖 ")
     @TableField(value = "reward_flag_")
     private Integer rewardFlag;
+    @ApiModelProperty(value = "活动分类类型")
+    @TableField(value = "share_type_")
+    private ActivityShareEnum shareType;
     @ApiModelProperty("创建时间 ")
     @TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -213,6 +215,14 @@ public class ActivityPlan implements Serializable {
         this.activityState = activityState;
     }
 
+    public ActivityShareEnum getShareType() {
+        return Optional.ofNullable(shareType).orElse(ActivityShareEnum.DEFAULT);
+    }
+
+    public void setShareType(ActivityShareEnum shareType) {
+        this.shareType = shareType;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -85,6 +86,18 @@ public class ActivityReward implements Serializable {
     @TableField(value = "update_by_")
     private Long updateBy;
 
+    @ApiModelProperty("优惠金额")
+    @TableField(value = "discount_price_")
+    private BigDecimal discountPrice;
+
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public void setDiscountPrice(BigDecimal discountPrice) {
+        this.discountPrice = discountPrice;
+    }
+
     public Long getId() {
         return id;
     }

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

@@ -36,6 +36,11 @@ public class UserOrder implements Serializable {
     @ApiModelProperty(value = "推荐用户id(有推荐人的情况)")
     @TableField(value = "recom_user_id_")
     private Long recomUserId;
+
+    @ApiModelProperty(value = "活动id(有活动的情况)")
+    @TableField(value = "activity_id_")
+    private Long activityId;
+
     @ApiModelProperty("订单名称 ")
     @TableField(value = "order_name_")
     private String orderName;
@@ -87,6 +92,13 @@ public class UserOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
 
 
     public Long getId() {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.vo.ActivityEvaluationRecordVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityEvaluationRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluationRecord;
+import com.yonge.cooleshow.common.enums.ActivityResourceEnum;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -47,4 +48,14 @@ public interface ActivityEvaluationRecordService extends IService<ActivityEvalua
 	 * @param score 分数
 	 */
     void saveRecord(Long evaluationId, Long userId, BigDecimal score);
+
+	/**
+	 * 添加活动参与记录
+	 *
+	 * @param activityId 活动id
+	 * @param userId 用户id
+	 * @param resourceId 资源id
+	 * @param resourceType 资源类型
+	 */
+    void saveActivityRecord(Long activityId, Long userId, Long resourceId, ActivityResourceEnum resourceType);
 }

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

@@ -3,23 +3,17 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
-
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.SaveOrUpdateRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
-
-import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-
-import java.util.List;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
 
 /**
  * 活动计划表 服务类
@@ -108,4 +102,13 @@ public interface ActivityPlanService extends IService<ActivityPlan>  {
 	 * @return
 	 */
     Boolean saveOrUpdateReward(SaveOrUpdateRewardDto saveOrUpdateRewardDto);
+
+
+	/**
+	 * 活动分享
+	 * @param type 分享类型
+	 * @param userId 用户id
+	 * @return
+	 */
+	ActivityPlanVo activityShare(ActivityShareEnum type, Long userId);
 }

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

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
 import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceVo;
 import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
@@ -86,4 +87,12 @@ public interface MemberPriceSettingsService extends IService<MemberPriceSettings
      * @return
      */
     Boolean addVip(VipSubmitReq vipSubmitReq, ClientEnum client, SysUser sysUser);
+
+    /**
+     * 会员信息
+     *
+     * @param query
+     * @return
+     */
+    MemberPriceVo getVipShare(MemberPriceSettingsSearch query);
 }

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

@@ -305,7 +305,6 @@ public interface MusicSheetService extends IService<MusicSheet> {
      /** 查询审核曲目信息
      *
      * @param authMusicSheetId 曲目审核id
-     * @return
      */
     MusicSheetDetailVo auditDetail(Long authMusicSheetId);
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.entity.ActivityEvaluation;
 import com.yonge.cooleshow.biz.dal.service.ActivityEvaluationService;
+import com.yonge.cooleshow.common.enums.ActivityResourceEnum;
 import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,4 +63,23 @@ public class ActivityEvaluationRecordServiceImpl extends ServiceImpl<ActivityEva
         save(activityEvaluationRecord);
     }
 
+    @Override
+    public void saveActivityRecord(Long activityId, Long userId, Long resourceId, ActivityResourceEnum resourceType) {
+        List<ActivityEvaluation> list = activityEvaluationService.lambdaQuery()
+                                                                 .eq(ActivityEvaluation::getActivityId, activityId)
+                                                                 .eq(ActivityEvaluation::getMusicSheetId, resourceId)
+                                                                 .eq(ActivityEvaluation::getResourceType, resourceType)
+                                                                 .list();
+        ActivityEvaluation activityEvaluation = new ActivityEvaluation();
+        if (!CollectionUtils.isEmpty(list)) {
+            activityEvaluation = list.get(0);
+        }
+        ActivityEvaluationRecord activityEvaluationRecord = new ActivityEvaluationRecord();
+        activityEvaluationRecord.setResourceId(resourceId);
+        activityEvaluationRecord.setUserId(userId);
+        activityEvaluationRecord.setActivityId(activityId);
+        activityEvaluationRecord.setEvaluationId(activityEvaluation.getId());
+        this.save(activityEvaluationRecord);
+    }
+
 }

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

@@ -2,55 +2,44 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ActivityPlanDao;
-import com.yonge.cooleshow.biz.dal.dao.ActivityPlanEvaluationDao;
-import com.yonge.cooleshow.biz.dal.dao.ActivityRewardChangeStockDao;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanDto;
+import com.yonge.cooleshow.biz.dal.dto.ActivityPlanPayDto;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.SaveOrUpdateRewardDto;
-import com.yonge.cooleshow.biz.dal.dto.req.OrderPayReq;
-import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
-import com.yonge.cooleshow.biz.dal.entity.ActivityPlanEvaluation;
-import com.yonge.cooleshow.biz.dal.dto.ActivityPlanPayDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.*;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
-import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
-import com.yonge.cooleshow.biz.dal.vo.*;
+import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
+import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
+import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
+import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
-import com.yonge.cooleshow.common.enums.CacheNameEnum;
-import com.yonge.cooleshow.common.enums.RegistrationMethodEnum;
+import com.yonge.cooleshow.common.enums.*;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.payment.util.DistributedLock;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
-import org.redisson.api.RedissonClient;
-import org.springframework.stereotype.Service;
 import org.apache.commons.collections.CollectionUtils;
+import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
-import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.Date;
-
-import java.util.List;
-import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -475,10 +464,12 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         Long activityId = saveOrUpdateRewardDto.getActivityId();
         List<ActivityPlanRewardDto> updateRewardDtoList = saveOrUpdateRewardDto.getUpdateRewardDtoList();
 
-        if(CollectionUtils.isEmpty(updateRewardDtoList)){
+
+		if(CollectionUtils.isEmpty(updateRewardDtoList)){
             updateRewardDtoList = new ArrayList<>();
         }
 
+
         for (ActivityPlanRewardDto rewardDto : updateRewardDtoList) {
             activityPlanRewardService.saveOrUpdateReward(rewardDto);
         }
@@ -494,6 +485,21 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         return true;
     }
 
+    @Override
+    public ActivityPlanVo activityShare(ActivityShareEnum type, Long userId) {
+        if (userId == null || type == null) {
+            return null;
+        }
+        ActivityPlanVo detail = baseMapper.selectActivityShare(type.getCode(), userId);
+        if (detail ==null) {
+            return null;
+        }
+        //查询活动奖品
+        List<ActivityPlanRewardDto> activityRewardList = activityPlanRewardService.queryActivityPlanReward(detail.getId());
+        detail.setActivityRewardList(activityRewardList);
+        return detail;
+    }
+
     /**
      * 参与活动消息
      */

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.VipSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.entity.*;
@@ -23,6 +24,9 @@ import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
+import com.yonge.cooleshow.common.enums.RewardTypeEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.string.MessageFormatter;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
@@ -35,6 +39,7 @@ import org.slf4j.LoggerFactory;
 import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 
@@ -56,6 +61,10 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private SysConfigService sysConfigService;
+
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
     @Override
     public MemberPriceSettingsVo detail(Long id) {
         return baseMapper.detail(id);
@@ -78,14 +87,29 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         if (null == detail) {
             return HttpResponseResult.failed("未找到会员卡信息");
         }
+
         OrderCreateRes orderCreateRes = new OrderCreateRes();
+        BigDecimal couponAmount = BigDecimal.ZERO;
+        // 获取活动的优惠信息
+        ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.VIP,
+                                                                          orderReqInfo.getUserId());
+        if (activityPlanVo != null) {
+            for (ActivityPlanRewardDto activityPlanRewardDto : activityPlanVo.getActivityRewardList()) {
+                if (activityPlanRewardDto.getActivityReward().getUnit().getCode().equals(detail.getPeriod().getCode())) {
+                    couponAmount = activityPlanRewardDto.getActivityReward().getDiscountPrice();
+                    orderCreateRes.setActivityId(activityPlanVo.getId());
+                }
+            }
+        }
+
         orderCreateRes.setRes(true);
         orderCreateRes.setMerchId(0l);
         orderCreateRes.setBizId(detail.getId());
         orderCreateRes.setBizContent("会员卡购买-" + detail.getPeriod().getMsg());
         orderCreateRes.setGoodNum(1);
         orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
-        orderCreateRes.setExpectPrice(detail.getSalePrice());
+        orderCreateRes.setCouponAmount(couponAmount);
+        orderCreateRes.setExpectPrice(detail.getOriginalPrice());
         return HttpResponseResult.succeed(orderCreateRes);
     }
 
@@ -182,6 +206,33 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         return true;
     }
 
+    @Override
+    public MemberPriceVo getVipShare(MemberPriceSettingsSearch query) {
+        MemberPriceVo memberPriceVo = new MemberPriceVo();
+        List<MemberPriceSettingsVo> memberPriceSettingsVos = baseMapper.selectList(query);
+        ActivityPlanVo activityPlan = activityPlanService.activityShare(ActivityShareEnum.VIP, query.getUserId());
+        if (activityPlan == null) {
+            memberPriceVo.setList(memberPriceSettingsVos);
+            return memberPriceVo;
+        }
+
+        SysUser user = sysUserFeignService.queryUserById(query.getUserId());
+        memberPriceVo.setDiscount(YesOrNoEnum.YES);
+        memberPriceVo.setAvatar(user.getAvatar());
+        memberPriceVo.setUsername(user.getUsername());
+
+        for (ActivityPlanRewardDto activityPlanRewardDto : activityPlan.getActivityRewardList()) {
+            for (MemberPriceSettingsVo memberPriceSettingsVo : memberPriceSettingsVos) {
+                memberPriceSettingsVo.setDiscount(YesOrNoEnum.NO);
+                if (memberPriceSettingsVo.getPeriod().getCode().equals( activityPlanRewardDto.getActivityReward().getUnit().getCode())) {
+                    memberPriceSettingsVo.setDiscount(YesOrNoEnum.YES);
+                    memberPriceSettingsVo.setDiscountPrice(activityPlanRewardDto.getActivityReward().getDiscountPrice());
+                }
+            }
+        }
+        return memberPriceVo;
+    }
+
     private void sendAddVipMessage(Long userId, ClientEnum client, Integer times, PeriodEnum type, String reason) {
         try {
             SysUser user = sysUserFeignService.queryUserById(userId);

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

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.*;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
 import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
@@ -29,6 +30,7 @@ import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.easyexcel.ErrMsg;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReaderProperty;
 import com.yonge.toolset.utils.easyexcel.ExcelException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -38,6 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
@@ -65,6 +68,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     private MusicFavoriteService musicFavoriteService;
 
     @Autowired
+    private ActivityPlanService  activityPlanService;
+
+    @Autowired
     private SysConfigService sysConfigService;
 
     @Autowired
@@ -376,17 +382,20 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         boolean flag;
         Long originalMusicSheetId = musicSheetAuthRecordService.audit(param, userId);
         musicSheet.setAuditStatus(param.getAuthStatus());
+
         if (param.getAuthStatus().equals(AuthStatusEnum.PASS) && StringUtil.isEmpty(param.getMusicImg())) {
             throw new BizException("曲目渲染失败");
         } else if (param.getAuthStatus().equals(AuthStatusEnum.PASS) && !StringUtil.isEmpty(param.getMusicImg())) {
             musicSheet.setMusicImg(param.getMusicImg());
         }
+
         musicSheet.setUpdateBy(userId);
         musicSheet.setUpdateTime(new Date());
         if (AuthStatusEnum.PASS.getCode().equals(param.getAuthStatus().getCode())) {
             musicSheet.setState(YesOrNoEnum.YES);
             // 替换曲目id
             replaceMusicSheet(param, musicSheet, originalMusicSheetId);
+
             // 修改老师标签
             teacherService.setTeacherTag(musicSheet.getUserId(), TeacherTagEnum.MUSIC);
 
@@ -969,6 +978,14 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         ShareProfitVo result = new ShareProfitVo();
         MusicSheetDetailVo musicSheet = detail(musicSheetId, null, null);
 
+        YesOrNoEnum discount = YesOrNoEnum.NO;
+        if (ChargeTypeEnum.VIP.equals(musicSheet.getChargeType())) {
+            discount = activityPlanService.activityShare(ActivityShareEnum.VIP, sysUser.getId()) ==null?YesOrNoEnum.NO:YesOrNoEnum.YES;
+        } else if (ChargeTypeEnum.CHARGE.equals(musicSheet.getChargeType())) {
+            discount = activityPlanService.activityShare(ActivityShareEnum.MUSIC_SHEET,
+                                                                          sysUser.getId()) ==null?YesOrNoEnum.NO:YesOrNoEnum.YES;
+        }
+        result.setDiscount(discount);
         result.setTeacherId(sysUser.getId());
         result.setType("MUSIC");
         result.setMusicSheet(musicSheet);
@@ -1064,7 +1081,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return baseMapper.auditDetailList(musicSheetAuthRecord.getOriginalMusicSheetId(),authMusicSheetId);
     }
 
-    private SysUser getSysUser(Long userId) {
+
+	private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
                 .map(sysUserFeignService::queryUserById)
                 .orElseThrow(() -> new BizException("用户不存在"));

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

@@ -17,6 +17,7 @@ import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderPayRes;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.ActivityResourceEnum;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
 import com.yonge.cooleshow.common.service.IdGeneratorService;
@@ -85,6 +86,12 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private PaymentProperties paymentProperties;
 
     @Autowired
+    private ActivityEvaluationRecordService activityEvaluationRecordService;
+
+    @Autowired
+    private ActivityRegistrationService activityRegistrationService;
+
+    @Autowired
     private ActivityPlanService activityPlanService;
 
     //验证订单是否可以下单,获取订单金额信息
@@ -297,12 +304,19 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             createRes.setGoodType(info.getGoodType());
             //todo 优惠券优惠金额，暂时为0
             BigDecimal couponAmount = BigDecimal.ZERO;
+            if (createRes.getCouponAmount() != null) {
+                couponAmount = createRes.getCouponAmount();
+            }
+            if (couponAmount.compareTo(createRes.getExpectPrice()) > 0 ){
+                couponAmount = createRes.getActualPrice();
+            }
             createRes.setActualPrice(createRes.getExpectPrice().subtract(couponAmount).setScale(2, RoundingMode.HALF_UP));
             createRes.setCouponAmount(couponAmount);
             //累计实际支付金额
             actualPrice = actualPrice.add(createRes.getActualPrice());
 
             info.setCreateRes(createRes);
+            orderReq.setActivityId(createRes.getActivityId());
         }
 
         //验证金额
@@ -532,6 +546,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private UserOrderVo insertOrder(OrderReq orderReq) {
         UserOrder userOrder = new UserOrder();
 
+        userOrder.setActivityId(orderReq.getActivityId());
         userOrder.setOrderNo(orderReq.getOrderNo());
         userOrder.setUserId(orderReq.getUserId());
         userOrder.setOrderName(orderReq.getOrderName());
@@ -601,10 +616,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             userOrder.setPlantformFee(userOrder.getPlantformFee().add(orderDetail.getPlantformFee()));
         }
 
-        //todo 优惠券优惠金额，暂时为0
-        BigDecimal couponAmount = BigDecimal.ZERO;
-        userOrder.setActualPrice(userOrder.getActualPrice().subtract(couponAmount));
-        userOrder.setCouponAmount(userOrder.getCouponAmount().add(couponAmount));
+        userOrder.setActualPrice(userOrder.getActualPrice());
+        userOrder.setCouponAmount(userOrder.getCouponAmount());
 
         if (userOrder.getActualPrice().subtract(orderReq.getActualPrice()).abs()
                 .compareTo(new BigDecimal("0.01")) > 0) {
@@ -774,6 +787,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             orderDetailVo.setUserId(detail.getUserId());
             orderDetailVo.setOrderId(detail.getId());
             orderDetailVo.setRecomUserId(detail.getRecomUserId());
+            orderDetailVo.setActivityId(detail.getActivityId());
+
             //调用业务
             Consumer<UserOrderDetailVo> userOrderVoConsumer = orderSuccess.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(userOrderVoConsumer)) {
@@ -786,6 +801,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             if (merchId != null && merchId != 0) {
                 redissonClient.getBucket(CacheNameEnum.TEACHER_TOTAL.getRedisKey(merchId)).delete();
             }
+
+            // 记录活动参与
+            saveActivityRecord(orderDetailVo);
         }
         //清除买家统计缓存
         if (ClientEnum.STUDENT.getCode().equals(detail.getPaymentClient())) {
@@ -795,6 +813,21 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
     }
 
+    private void saveActivityRecord(UserOrderDetailVo orderDetailVo) {
+        if (orderDetailVo.getActivityId() == null || orderDetailVo.getActivityId() == 0) {
+            return;
+        }
+        ActivityRegistration activityRegistration = new ActivityRegistration();
+        activityRegistration.setActivityId(orderDetailVo.getActivityId());
+        activityRegistration.setOrderNo(orderDetailVo.getOrderNo());
+        activityRegistration.setSubOrderNo(orderDetailVo.getSubOrderNo());
+        activityRegistration.setUserId(orderDetailVo.getUserId());
+        activityRegistration.setCreateTime(new Date());
+        activityRegistrationService.save(activityRegistration);
+        activityEvaluationRecordService.saveActivityRecord(orderDetailVo.getActivityId(), orderDetailVo.getUserId(),
+                                                           orderDetailVo.getRecomUserId(), ActivityResourceEnum.TEACHER);
+    }
+
     /**
      * 记录平台收入和用户分润收入
      *
@@ -817,6 +850,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             platformFeeRate = BigDecimal.ONE;
         }
         BigDecimal platformFee = expectPrice.multiply(platformFeeRate).setScale(2, RoundingMode.HALF_UP);
+        platformFee = platformFee.subtract(orderDetailVo.getCouponAmount());
 
         if (platformFee.compareTo(BigDecimal.ZERO) > 0) {
             PlatformCashAccountRecord platformCashAccountRecord;
@@ -831,31 +865,32 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                         orderDetailVo.getOrderNo(), accountPeriodTime);
             }
             platformCashAccountRecordService.save(platformCashAccountRecord);
-        }
 
-        //卖家不能分润自己
-        if (null != orderDetailVo.getRecomUserId()
-                && !orderDetailVo.getRecomUserId().equals(orderDetailVo.getMerchId())) {
-            //获取分润收益费率
-            BigDecimal shareFeeRate = getShareFreeByGoodType(orderDetailVo.getGoodType()
-                    , orderDetailVo.getBizId());
-            //入老师账户
-            BigDecimal shareFee = expectPrice.multiply(shareFeeRate).setScale(2, RoundingMode.HALF_UP);
-            if (shareFee.compareTo(BigDecimal.ZERO) > 0) {
-                AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode() + "_SHARE");
-                if (null != bizTypeEnum) {
-                    //插入分润老师账户变更记录-分润老师预收
-                    HttpResponseResult<UserAccountRecord> recomRecordRes = userAccountService.accountRecord(
-                            new UserAccountRecordDto(orderDetailVo.getRecomUserId(), PostStatusEnum.WAIT, shareFee, InOrOutEnum.IN,
-                                    bizTypeEnum, orderDetailVo.getBizId(), bizTypeEnum.getMsg(), orderDetailVo.getOrderNo(), orderDetailVo.getUserId(), accountPeriodTime));
-                    if (recomRecordRes.getStatus()) {
-                        //插入平台预支
-                        PlatformCashAccountRecord platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getRecomUserId(), shareFee,
-                                InOrOutEnum.OUT, PostStatusEnum.WAIT, bizTypeEnum, orderDetailVo.getBizId(), orderDetailVo.getOrderNo(), accountPeriodTime);
-                        platformCashAccountRecordService.save(platformCashAccountRecord);
+            //卖家不能分润自己
+            if (null != orderDetailVo.getRecomUserId()
+                    && !orderDetailVo.getRecomUserId().equals(orderDetailVo.getMerchId())) {
+                //获取分润收益费率
+                BigDecimal shareFeeRate = getShareFreeByGoodType(orderDetailVo.getGoodType()
+                        , orderDetailVo.getBizId());
+                //入老师账户
+                BigDecimal shareFee = platformFee.multiply(shareFeeRate).setScale(2, RoundingMode.HALF_UP);
+                if (shareFee.compareTo(BigDecimal.ZERO) > 0) {
+                    AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode() + "_SHARE");
+                    if (null != bizTypeEnum) {
+                        //插入分润老师账户变更记录-分润老师预收
+                        HttpResponseResult<UserAccountRecord> recomRecordRes = userAccountService.accountRecord(
+                                new UserAccountRecordDto(orderDetailVo.getRecomUserId(), PostStatusEnum.WAIT, shareFee, InOrOutEnum.IN,
+                                        bizTypeEnum, orderDetailVo.getBizId(), bizTypeEnum.getMsg(), orderDetailVo.getOrderNo(), orderDetailVo.getUserId(), accountPeriodTime));
+                        if (recomRecordRes.getStatus()) {
+                            //插入平台预支
+                            platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getRecomUserId(), shareFee,
+                                    InOrOutEnum.OUT, PostStatusEnum.WAIT, bizTypeEnum, orderDetailVo.getBizId(), orderDetailVo.getOrderNo(), accountPeriodTime);
+                            platformCashAccountRecordService.save(platformCashAccountRecord);
+                        }
                     }
                 }
             }
+
         }
     }
 

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

@@ -219,7 +219,7 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
     public void updateShelves(VideoLessonShelvesVo shelvesVo) {
         //改主表
         videoLessonGroupDao.updateShelves(shelvesVo);
-        if(shelvesVo.getShelvesFlag() == 0){
+        if(shelvesVo.getShelvesFlag() == 0 && ClientEnum.SYSTEM.equals(shelvesVo.getClientType())){
             //发推送
             sendOutSaleMessage(shelvesVo);
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceSettingsVo.java

@@ -1,9 +1,12 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 /**
  * @Author: liweifan
  * @Data: 2022-04-25 14:34:49
@@ -14,6 +17,29 @@ public class MemberPriceSettingsVo extends MemberPriceSettings{
     @ApiModelProperty("更新人 ")
     private String modifierName;
 
+
+    @ApiModelProperty("专属优惠 0：否 1：是")
+    private YesOrNoEnum discount;
+
+    @ApiModelProperty("优惠价格")
+    private BigDecimal discountPrice;
+
+    public YesOrNoEnum getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(YesOrNoEnum discount) {
+        this.discount = discount;
+    }
+
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public void setDiscountPrice(BigDecimal discountPrice) {
+        this.discountPrice = discountPrice;
+    }
+
     public String getModifierName() {
         return modifierName;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MemberPriceVo.java

@@ -0,0 +1,62 @@
+package com.yonge.cooleshow.biz.dal.vo;
+
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-08-29
+ */
+@ApiModel("会员列表")
+public class MemberPriceVo {
+
+
+    @ApiModelProperty("分享人姓名")
+    private String username;
+
+    @ApiModelProperty("分享人头像")
+    private String avatar;
+
+    @ApiModelProperty("专属优惠 0：否 1：是")
+    private YesOrNoEnum discount = YesOrNoEnum.NO;
+
+    @ApiModelProperty("会员列表")
+    List<MemberPriceSettingsVo> list;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public YesOrNoEnum getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(YesOrNoEnum discount) {
+        this.discount = discount;
+    }
+
+    public List<MemberPriceSettingsVo> getList() {
+        return list;
+    }
+
+    public void setList(List<MemberPriceSettingsVo> list) {
+        this.list = list;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/ShareProfitVo.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -28,6 +29,9 @@ public class ShareProfitVo {
     @ApiModelProperty("曲目： MUSIC,直播课 ：LIVE,视频课：VIDEO ,会员 ：VIP")
     private String type;
 
+    @ApiModelProperty("专属优惠 0：否 1：是")
+    private YesOrNoEnum discount;
+
     @ApiModelProperty("乐谱信息")
     private MusicSheetDetailVo musicSheet;
 
@@ -44,6 +48,14 @@ public class ShareProfitVo {
         return teacherId;
     }
 
+    public YesOrNoEnum getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(YesOrNoEnum discount) {
+        this.discount = discount;
+    }
+
     public void setTeacherId(Long teacherId) {
         this.teacherId = teacherId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderDetailVo.java

@@ -36,6 +36,17 @@ public class UserOrderDetailVo extends UserOrderDetail {
     @ApiModelProperty(value = "分润用户编号")
     private Long recomUserId;
 
+    @ApiModelProperty("活动id")
+    private Long activityId;
+
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
     public ClientEnum getOrderClient() {
         return orderClient;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VideoLessonShelvesVo.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.valid.ListValue;
 import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,16 @@ public class VideoLessonShelvesVo extends BaseEntity {
     @ApiModelProperty(value = "上下架操作人", hidden = true)
     private Long shelvesId;
 
+    private ClientEnum clientType;
+
+    public ClientEnum getClientType() {
+        return clientType;
+    }
+
+    public void setClientType(ClientEnum clientType) {
+        this.clientType = clientType;
+    }
+
     public Long getId() {
         return id;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/OrderCreateRes.java

@@ -33,9 +33,20 @@ public class OrderCreateRes {
     @ApiModelProperty("优惠金额 ")
     private BigDecimal couponAmount;
 
+    @ApiModelProperty("活动id")
+    private Long activityId;
+
     @ApiModelProperty(value = "冗余字段，用于传递参数用")
     private Object bizParam;
 
+    public Long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Long activityId) {
+        this.activityId = activityId;
+    }
+
     public Boolean getRes() {
         return res;
     }

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

@@ -5,6 +5,7 @@
         <result column="id_" property="id" />
         <result column="activity_id_" property="activityId" />
         <result column="music_sheet_id_" property="musicSheetId" />
+        <result column="resource_type_" property="resourceType" />
         <result column="create_time_" property="createTime" />
         <result column="create_by_" property="createBy" />
     </resultMap>
@@ -14,6 +15,7 @@
         t.id_ as id
         , t.activity_id_ as activityId
         , t.music_sheet_id_ as musicSheetId
+        , t.resource_type_ as resourceType
         , t.create_time_ as createTime
         , t.create_by_ as createBy
     </sql>

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

@@ -72,14 +72,17 @@
             <if test="param.draftFlag != null">
                 and t.draft_flag_ = #{param.draftFlag}
             </if>
-            <if test="param.activityState != null">
-                <if test="param.activityState == 0">
-                    and (t.activity_state_ = 0 or t.activity_state_ = 2)
-                </if>
-                <if test="param.activityState == 1">
-                    and t.activity_state_ = 1
-                </if>
-            </if>
+            <choose>
+                <when test="param.activityState != null">
+                    <if test="param.activityState == 0">
+                        and (t.activity_state_ = 0 or t.activity_state_ = 2)
+                    </if>
+                    <if test="param.activityState == 1">
+                        and t.activity_state_ = 1
+                    </if>
+                </when>
+                <otherwise> AND t.activity_start_ &gt;= -1 </otherwise>
+            </choose>
             <if test="param.startTime !=null">
                 and t.activity_start_ &gt;= #{param.startTime}
             </if>
@@ -110,4 +113,21 @@
             or (t.activity_end_ &lt;= now() and activity_state_ = 1)
         )
     </select>
+
+	<select id="selectActivityShare" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo">
+        select
+        <include refid="baseColumns"/>
+        from activity_plan ap
+        left join activity_evaluation ae on ap.id_ = ae.activity_id_
+        <where>
+            activity_state_ = 1 and activity_start_ &lt;= now() and activity_end_ &gt;= now()
+            <if test="type != null and type != ''">
+                and #{type} = ap.share_type_
+            </if>
+            <if test="userId != null">
+                and ae.music_sheet_id_ = #{userId}
+                and ae.resource_type_ = 'TEACHER'
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -17,6 +17,7 @@
         <result column="create_by_" property="createBy" />
         <result column="update_time_" property="updateTime" />
         <result column="update_by_" property="updateBy" />
+        <result column="discount_price_" property="discountPrice" />
     </resultMap>
 
     <!-- 表字段 -->
@@ -36,6 +37,7 @@
         , t.create_by_ as createBy
         , t.update_time_ as updateTime
         , t.update_by_ as updateBy
+        , t.discount_price_   as discountPrice
     </sql>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityRewardVo">

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

@@ -6,6 +6,7 @@
         <result column="order_no_" property="orderNo"/>
         <result column="user_id_" property="userId"/>
         <result column="recom_user_id_" property="recomUserId"/>
+        <result column="activity_id_" property="activityId"/>
         <result column="order_name_" property="orderName"/>
         <result column="order_client_" property="orderClient"/>
         <result column="order_type_" property="orderType"/>
@@ -29,6 +30,7 @@
         , t.order_no_ as orderNo
         , t.user_id_ as userId
         , t.recom_user_id_ as recomUserId
+        , t.activity_id_ as activityId
         , t.order_name_ as orderName
         , t.order_client_ as orderClient
         , t.order_type_ as orderType

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MemberPriceSettingsController.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
+import com.yonge.cooleshow.biz.dal.vo.MemberPriceVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -36,9 +37,9 @@ public class MemberPriceSettingsController extends BaseController {
 
 	@PostMapping("/list")
 	@ApiOperation(value = "查询列表")
-	public HttpResponseResult<List<MemberPriceSettingsVo>> list(@RequestBody MemberPriceSettingsSearch query) {
-		List<MemberPriceSettingsVo> list = memberPriceSettingsService.selectList(query);
-		return succeed(list);
+	public HttpResponseResult<MemberPriceVo> list(@RequestBody MemberPriceSettingsSearch query) {
+		MemberPriceVo memberPriceVo = memberPriceSettingsService.getVipShare(query);
+		return succeed(memberPriceVo);
 	}
 
 	@PostMapping("/vipPermissions")

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/open/OpenClient.java

@@ -1,10 +1,34 @@
 package com.yonge.cooleshow.student.controller.open;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ksyun.ks3.dto.PostObjectFormFields;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.StudentService;
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.service.UploadFileService;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -12,12 +36,6 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.thirdparty.entity.UploadSign;
 import com.yonge.toolset.utils.string.ValueUtil;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Map;
 
 
 @RestController

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/VideoLessonGroupController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -193,6 +194,8 @@ public class VideoLessonGroupController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+
+        shelvesVo.setClientType(ClientEnum.TEACHER);
         videoLessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
 import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.ActivityShareEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -35,6 +36,9 @@ public class OpenShareController extends BaseController {
     @Autowired
     private MemberPriceSettingsService memberPriceSettingsService;
 
+    @Autowired
+    private ActivityPlanService activityPlanService;
+
     /**
      * 服务对象
      */
@@ -86,12 +90,6 @@ public class OpenShareController extends BaseController {
         return succeed(memberPriceSettingsService.shareVipProfit(sysUser,param.getBizId()));
     }
 
-
-
-    @Autowired
-    private ActivityPlanService activityPlanService;
-
-
     @ApiOperation(value = "老师活动分享", notes = "活动id")
     @PostMapping(value = "/activity/info/{id}")
     public HttpResponseResult<MusicActivityVo> getDetail(@PathVariable Long id) {

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/VideoLessonGroupController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.website.controller;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -55,6 +56,8 @@ public class VideoLessonGroupController extends BaseController {
 
         shelvesVo.setShelvesId(user.getId());
         shelvesVo.setShelvesTime(new Date());
+
+        shelvesVo.setClientType(ClientEnum.WEBSITE);
         videoLessonGroupService.updateShelves(shelvesVo);
         return succeed();
     }

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenClient.java

@@ -16,14 +16,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
-
 @RestController
 @RequestMapping("/open")
 @Api(value = "开放权限接口", tags = "开放权限接口")
 public class OpenClient extends BaseController {
+
     @Autowired
     private UploadFileService uploadFileService;
 
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "bucketName", dataType = "String", value = "为空时默认使用daya"),
             @ApiImplicitParam(name = "fileName", dataType = "String", value = "要上传的文件名称,不包含路径信息"),

pom.xml

@@ -280,6 +280,18 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<!--增加lombok编译-->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<build>