Merge branch 'dev_1_3_4_20220825'

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

@@ -17,7 +17,6 @@ public enum ActivityShareEnum implements BaseEnum<String, ActivityShareEnum> {
     VIDEO("视频"),
     LIVE("直播"),
     GOODS("商品"),
-    DEFAULT("默认"),
     ;
 
     @EnumValue

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

@@ -27,5 +27,12 @@ public interface ActivityUserRewardDao extends BaseMapper<ActivityUserReward>{
      * @return: com.yonge.cooleshow.biz.dal.vo.ActivityUserRewardVo
 	 */
 	List<UserRewardVo> selectPage(@Param("page") IPage page, @Param("param") ActivityUserRewardSearch activityUserReward);
-	
+
+	/**
+	 * 用户关联活动分享老师信息
+	 * @param activityId 活动ID
+	 * @param userIds 用户ID
+	 * @return List<UserRewardVo>
+	 */
+	List<UserRewardVo> selectActivityShareTeacher(@Param("activityId") Long activityId, @Param("userIds") List<Long> userIds);
 }

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

@@ -4,7 +4,6 @@ import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -19,8 +18,18 @@ public class ActivityEvaluationDto extends BaseEntity {
 	@NotNull(message = "活动id不能为空")
 	private Long activityId;
 	@ApiModelProperty("曲目id 多个用,分割 ")
-	@NotBlank(message = "曲子id不能为空")
-	private String musicSheetIds;
+	//@NotBlank(message = "曲子id不能为空")
+	private String musicSheetIds; // 评测活动曲目ID
+	@ApiModelProperty("活动老师id 多个用,分割 ")
+	private String teacherIds; // 分享活动老师ID
+
+	public String getTeacherIds() {
+		return teacherIds;
+	}
+
+	public void setTeacherIds(String teacherIds) {
+		this.teacherIds = teacherIds;
+	}
 
 	public Long getActivityId() {
 		return activityId;

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

@@ -45,6 +45,9 @@ public class OrderReq {
 
     @ApiModelProperty(value = "活动id")
     private Long activityId;
+
+    @ApiModelProperty(value = "活动id",hidden = true)
+    private Long rewardId;
     @NotNull(message = "订单金额不能为空")
     @ApiModelProperty(value = "订单金额", required = true)
     private BigDecimal actualPrice;
@@ -159,6 +162,14 @@ public class OrderReq {
         }
     }
 
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
     public Long getUserId() {
         return userId;
     }

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

@@ -29,7 +29,7 @@ public class ActivityPlan implements Serializable {
     @ApiModelProperty("主键 ")
     @TableId(value = "id_", type = IdType.AUTO)
     private Long id;
-    @ApiModelProperty(value = "活动类型 EVALUATION 评测活动 STANDARD_GIFT 达标赠送", required = true)
+    @ApiModelProperty(value = "活动类型 EVALUATION 评测活动 STANDARD_GIFT 达标赠送 SHARE分享活动", required = true)
     @TableField(value = "activity_type_")
     @NotNull(message = "活动类型不能为空")
     private ActivityTypeEnum activityType;
@@ -90,7 +90,7 @@ public class ActivityPlan implements Serializable {
     @ApiModelProperty("发奖状态（完成状态） 0 未发奖 1 已发奖 ")
     @TableField(value = "reward_flag_")
     private Integer rewardFlag;
-    @ApiModelProperty(value = "活动分类类型")
+    @ApiModelProperty(value = "活动分类类型, MUSIC_SHEET(曲谱) MUSIC(音乐) VIP(会员) VIDEO(视频) LIVE(直播) GOODS(商品)")
     @TableField(value = "share_type_")
     private String shareType;
     @ApiModelProperty("创建时间 ")

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

@@ -41,6 +41,10 @@ public class UserOrder implements Serializable {
     @TableField(value = "activity_id_")
     private Long activityId;
 
+    @ApiModelProperty(value = "活动奖品id(有活动的情况)")
+    @TableField(value = "reward_id_")
+    private Long rewardId;
+
     @ApiModelProperty("订单名称 ")
     @TableField(value = "order_name_")
     private String orderName;
@@ -92,6 +96,14 @@ public class UserOrder implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
     public Long getActivityId() {
         return activityId;
     }

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

@@ -27,4 +27,13 @@ public interface ActivityUserRewardService extends IService<ActivityUserReward>
  	 * @date 2022-08-04
      */
     IPage<UserRewardVo> selectPage(IPage<UserRewardVo> page, ActivityUserRewardSearch query);
+
+	/**
+	 * 订单购买的发奖记录
+	 *
+	 * @param activityId 活动id
+	 * @param rewardId 奖品id
+	 * @param userId 用户id
+	 */
+    void saveRewardRecord(Long activityId, Long rewardId, Long userId);
 }

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ActivityEvaluationDao;
@@ -65,7 +66,40 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
 
     @Override
     public Boolean addBatch(ActivityEvaluationDto param, SysUser user) {
-        List<Long> musicSheetIds = WrapperUtil.toLongList(param.getMusicSheetIds());
+
+        // 活动信息
+        ActivityPlan activity = activityPlanService.getBaseMapper().selectById(param.getActivityId());
+        if (Objects.isNull(activity)) {
+            throw new BizException("无效的活动ID");
+        }
+
+        List<Long> activityContentIds = Lists.newArrayList();
+        switch (activity.getActivityType()) {
+            case EVALUATION: // 评测活动
+                if (StringUtils.isEmpty(param.getMusicSheetIds())) {
+                    throw new BizException("曲子id不能为空");
+                }
+
+                // 活动曲目ID
+                activityContentIds = WrapperUtil.toLongList(param.getMusicSheetIds());
+                break;
+            case SHARE: // 分享活动
+                if (StringUtils.isEmpty(param.getTeacherIds())) {
+                    throw new BizException("老师ID不能为空");
+                }
+
+                // 活动关联老师ID
+                activityContentIds = WrapperUtil.toLongList(param.getTeacherIds());
+                break;
+            case STANDARD_GIFT:
+            default:
+                break;
+        }
+
+        if (CollectionUtils.isEmpty(activityContentIds)) {
+            // 活动内容请求ID为空，直接忽略后面业务逻辑流程
+            return true;
+        }
 
         List<ActivityEvaluation> activityEvaluations = baseMapper.selectList(Wrappers.<ActivityEvaluation>lambdaQuery()
                 .eq(ActivityEvaluation::getActivityId, param.getActivityId())
@@ -96,15 +130,15 @@ public class ActivityEvaluationServiceImpl extends ServiceImpl<ActivityEvaluatio
         }
 
         List<Long> oldMusicSheetIds = activityEvaluations.stream().map(ActivityEvaluation::getMusicSheetId).collect(Collectors.toList());
-        musicSheetIds.removeAll(oldMusicSheetIds);
+        activityContentIds.removeAll(oldMusicSheetIds);
 
-        if ((oldMusicSheetIds.size() + musicSheetIds.size()) > 10
+        if ((oldMusicSheetIds.size() + activityContentIds.size()) > 10
                 && activityType == ActivityTypeEnum.EVALUATION) {
 
             throw new BizException("添加的曲目不能多余10首");
         }
-        if (CollectionUtils.isNotEmpty(musicSheetIds)) {
-            baseMapper.addBatch(param.getActivityId(), user.getId(), musicSheetIds, resourceType);
+        if (CollectionUtils.isNotEmpty(activityContentIds)) {
+            baseMapper.addBatch(param.getActivityId(), user.getId(), activityContentIds, resourceType);
             //更新修改人和修改时间
             activityPlanService.update(Wrappers.<ActivityPlan>lambdaUpdate()
                     .set(ActivityPlan::getUpdateBy, user.getId())

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

@@ -2,12 +2,16 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.yonge.cooleshow.biz.dal.entity.ActivityPlan;
 import com.yonge.cooleshow.biz.dal.service.ActivityPlanService;
 import com.yonge.cooleshow.biz.dal.vo.UserRewardVo;
 import com.yonge.cooleshow.common.enums.ActivityTypeEnum;
 import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.ActivityUserReward;
@@ -16,7 +20,9 @@ import com.yonge.cooleshow.biz.dal.dto.search.ActivityUserRewardSearch;
 import com.yonge.cooleshow.biz.dal.dao.ActivityUserRewardDao;
 import com.yonge.cooleshow.biz.dal.service.ActivityUserRewardService;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -41,17 +47,50 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
             throw  new BizException("无效的活动ID");
         }
 
+        // 活动获奖用户信息
         List<UserRewardVo> userRewards = baseMapper.selectPage(page, query);
 
-        // 分享活动查询关联老师信息
+        // 分享活动关联老师信息
         if (ActivityTypeEnum.SHARE == activityPlan.getActivityType()) {
 
+            Map<Long, String> teacherNameMap = Maps.newConcurrentMap();
             List<Long> userIds = userRewards.stream().map(UserRewardVo::getUserId).distinct().collect(Collectors.toList());
 
+            Lists.partition(userIds, 30).parallelStream().forEach(item -> {
 
+                // 同一个活动，用户关联多个老师信息
+                Map<Long, String> collect = getBaseMapper().selectActivityShareTeacher(activityPlan.getId(), item).stream()
+                        .collect(Collectors.groupingBy(UserRewardVo::getUserId, Collectors.mapping(x -> {
+
+                            if (StringUtils.isNotEmpty(x.getRealName())) {
+                                return x.getRealName();
+                            }
+                            return x.getUsername();
+                        }, Collectors.joining("、"))));
+
+                teacherNameMap.putAll(collect);
+            });
+
+            // 填充老师信息
+            for (UserRewardVo item : userRewards) {
+
+                item.setTeacherName(teacherNameMap.getOrDefault(item.getUserId(), ""));
+            }
         }
 
         return page.setRecords(userRewards);
     }
-	
+
+    @Override
+    public void saveRewardRecord(Long activityId, Long rewardId, Long userId) {
+        ActivityUserReward activityUserReward = new ActivityUserReward();
+        activityUserReward.setActivityId(activityId);
+        activityUserReward.setRewardId(rewardId);
+        activityUserReward.setUserId(userId);
+        activityUserReward.setCreateTime(new Date());
+        activityUserReward.setUpdateTime(new Date());
+        activityUserReward.setGrantFlag(1);
+        activityUserReward.setReceiveFlag(1);
+        this.save(activityUserReward);
+    }
 }

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

@@ -97,6 +97,8 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
                 if (activityPlanRewardDto.getActivityReward().getUnit().getCode().equals(detail.getPeriod().getCode())) {
                     couponAmount = activityPlanRewardDto.getActivityReward().getDiscountPrice();
                     orderCreateRes.setActivityId(activityPlanVo.getId());
+                    orderCreateRes.setRewardId(activityPlanRewardDto.getActivityReward().getId());
+                    break;
                 }
             }
         }

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

@@ -94,6 +94,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Autowired
     private ActivityPlanService activityPlanService;
 
+    @Autowired
+    private ActivityUserRewardService activityUserRewardService;
+
     //验证订单是否可以下单,获取订单金额信息
     private static final Map<GoodTypeEnum, Function<OrderReq.OrderReqInfo, HttpResponseResult<OrderCreateRes>>> orderCreate = new HashMap<>();
     //插入订单后执行
@@ -316,6 +319,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             //累计实际支付金额
             actualPrice = actualPrice.add(createRes.getActualPrice());
             orderReq.setActivityId(createRes.getActivityId());
+            orderReq.setRewardId(createRes.getRewardId());
 
             info.setCreateRes(createRes);
         }
@@ -546,7 +550,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
      */
     private UserOrderVo insertOrder(OrderReq orderReq) {
         UserOrder userOrder = new UserOrder();
-
+        userOrder.setRewardId(orderReq.getRewardId());
         userOrder.setActivityId(orderReq.getActivityId());
         userOrder.setOrderNo(orderReq.getOrderNo());
         userOrder.setUserId(orderReq.getUserId());
@@ -789,7 +793,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             orderDetailVo.setOrderId(detail.getId());
             orderDetailVo.setRecomUserId(detail.getRecomUserId());
             orderDetailVo.setActivityId(detail.getActivityId());
-
+            orderDetailVo.setRewardId(detail.getRewardId());
             //调用业务
             Consumer<UserOrderDetailVo> userOrderVoConsumer = orderSuccess.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(userOrderVoConsumer)) {
@@ -827,6 +831,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         activityRegistrationService.save(activityRegistration);
         activityEvaluationRecordService.saveActivityRecord(orderDetailVo.getActivityId(), orderDetailVo.getUserId(),
                                                            orderDetailVo.getRecomUserId(), ActivityResourceEnum.TEACHER);
+        activityUserRewardService.saveRewardRecord(orderDetailVo.getActivityId(),orderDetailVo.getRewardId(),orderDetailVo.getUserId());
     }
 
     /**

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

@@ -39,6 +39,17 @@ public class UserOrderDetailVo extends UserOrderDetail {
     @ApiModelProperty("活动id")
     private Long activityId;
 
+    @ApiModelProperty("活动奖品id")
+    private Long rewardId;
+
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
     public Long getActivityId() {
         return activityId;
     }

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

@@ -45,6 +45,10 @@ public class UserRewardVo implements Serializable {
 	private RewardTypeEnum rewardType;
 	@ApiModelProperty("单位 ")
 	private UnitEnum unit;
+	@ApiModelProperty("关联老师 ")
+	private String teacherName;
+	@ApiModelProperty("关联老师ID ")
+	private Long teacherId;
 
 	public Long getAmount() {
 		return amount;
@@ -101,4 +105,46 @@ public class UserRewardVo implements Serializable {
 	public void setRewardNames(String rewardNames) {
 		this.rewardNames = rewardNames;
 	}
+
+	public RewardTypeEnum getRewardType() {
+		return rewardType;
+	}
+
+	public void setRewardType(RewardTypeEnum rewardType) {
+		this.rewardType = rewardType;
+	}
+
+	public UnitEnum getUnit() {
+		return unit;
+	}
+
+	public void setUnit(UnitEnum unit) {
+		this.unit = unit;
+	}
+
+	public String getTeacherName() {
+		return teacherName;
+	}
+
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
+
+	public Long getTeacherId() {
+		return teacherId;
+	}
+
+	public void setTeacherId(Long teacherId) {
+		this.teacherId = teacherId;
+	}
+
+	public UserRewardVo teacherName(String teacherName) {
+		this.teacherName = teacherName;
+		return this;
+	}
+
+	public UserRewardVo teacherId(Long teacherId) {
+		this.teacherId = teacherId;
+		return this;
+	}
 }

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

@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
 public class ActivityTeacherWrapper implements Serializable {
 
     private Long id;
+    private Long teacherId;
     private String username;
     private String realName;
     private String phone;

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

@@ -36,9 +36,20 @@ public class OrderCreateRes {
     @ApiModelProperty("活动id")
     private Long activityId;
 
+    @ApiModelProperty("奖品id")
+    private Long rewardId;
+
     @ApiModelProperty(value = "冗余字段，用于传递参数用")
     private Object bizParam;
 
+    public Long getRewardId() {
+        return rewardId;
+    }
+
+    public void setRewardId(Long rewardId) {
+        this.rewardId = rewardId;
+    }
+
     public Long getActivityId() {
         return activityId;
     }

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

@@ -137,14 +137,15 @@
 
     <!--活动老师信息-->
     <resultMap id="ActivityTeacherPageInfoResultMap" type="com.yonge.cooleshow.biz.dal.vo.activity.ActivityTeacherWrapper">
-        <id column="id_" jdbcType="BIGINT" property="id" />
+        <result column="id_" jdbcType="BIGINT" property="id" />
         <result column="real_name_" jdbcType="BIGINT" property="realName" />
         <result column="username_" jdbcType="VARCHAR" property="username" />
         <result column="phone_" jdbcType="VARCHAR" property="phone" />
         <result column="subject_id_" jdbcType="VARCHAR" property="subjectId" />
+        <result column="teacher_id" jdbcType="BIGINT" property="teacherId" />
     </resultMap>
     <sql id="ActivityTeacherPageInfo_Column_List">
-        t1.id_, t1.real_name_, t1.username_, t1.phone_, t2.subject_id_
+        t1.id_ AS teacher_id, t1.real_name_, t1.username_, t1.phone_, t2.subject_id_, <if test="record.activityId != null"> t3.id_ AS id</if>
     </sql>
     <sql id="ActivityTeacherPageInfo_Condition_List">
         <if test="record.id != null">

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

@@ -42,6 +42,7 @@
         , t.registration_method_ as registrationMethod
         , t.registration_price_ as registrationPrice
         , t.share_rate_ as shareRate
+        , t.share_type_ as shareType
         , t.draft_flag_ as draftFlag
         , if(t.activity_state_ = 1, 1, 0) as activityState
         , t.create_time_ as createTime

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

@@ -16,7 +16,7 @@
         , t.reward_id_ as rewardId
         , t.reward_num_ as rewardNum
         , t.create_time_ as createTime
-        </sql> 
+        </sql>
     
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanRewardVo">
         SELECT

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

@@ -40,7 +40,7 @@
             su.username_ as username,
             su.phone_ as phone,
             min(t.create_time_) as createTime,
-            COUNT(DISTINCT t.id) AS amount,
+            COUNT(DISTINCT t.id_) AS amount,
             ar.reward_type_ AS rewardType,
             ar.unit_ AS unit,
             group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
@@ -68,4 +68,13 @@
         </where>
         GROUP BY t.user_id_,t.activity_id_
     </select>
+
+    <!--分享活动关联老师-->
+    <select id="selectActivityShareTeacher" resultType="com.yonge.cooleshow.biz.dal.vo.UserRewardVo">
+        SELECT t1.id_ AS teacherId, t1.username_ AS username, t1.real_name_ AS realName, t3.user_id_ AS userId
+        FROM sys_user t1 JOIN activity_evaluation t2 ON t1.id_ = t2.music_sheet_id_ JOIN activity_evaluation_record t3 ON t2.id = t3.evaluation_id_
+        WHERE t3.activity_id_ = #{activityId} AND t3.user_id_ =  IN (<foreach collection="userIds" separator="," item="item">#{item}</foreach>)
+    </select>
+    <!--分享活动关联老师-->
+
 </mapper>

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

@@ -7,6 +7,7 @@
         <result column="user_id_" property="userId"/>
         <result column="recom_user_id_" property="recomUserId"/>
         <result column="activity_id_" property="activityId"/>
+        <result column="reward_id_" property="rewardId"/>
         <result column="order_name_" property="orderName"/>
         <result column="order_client_" property="orderClient"/>
         <result column="order_type_" property="orderType"/>
@@ -31,6 +32,7 @@
         , t.user_id_ as userId
         , t.recom_user_id_ as recomUserId
         , t.activity_id_ as activityId
+        , t.reward_id_ as rewardId
         , t.order_name_ as orderName
         , t.order_client_ as orderClient
         , t.order_type_ as orderType