学员活动购买

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ActivityUserMapperDetailQueryInfo.java

@@ -23,6 +23,17 @@ public class ActivityUserMapperDetailQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "指导老师编号")
     private Integer teacherId;
 
+    @ApiModelProperty(value = "学员编号")
+    private Integer userId;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -208,7 +208,6 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 			Integer organId = Integer.parseInt(activityQueryDto.getOrganId());
 			BigDecimal buyNum = new BigDecimal(1);
 			activityList.stream().forEach(e->e.setSinglePrice(this.getActivityPrice(e,organId,buyNum)));
-			//判断活动类型。VIP、PRACTICE、MEMBER、THEORY
 		}
 		return activityList;
 	}

mec-biz/src/main/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -605,6 +605,9 @@
 			<if test="search != null and search != ''">
 				AND (aum.activity_id_ = #{search} OR aum.add_memo_ LIKE CONCAT('%',#{search},'%'))
 			</if>
+			<if test="userId != null">
+				AND aum.user_id_ = #{userId}
+			</if>
 			<if test="organId != null and organId != ''">
 				AND FIND_IN_SET(su.organ_id_,#{organId})
 			</if>