zouxuan 3 anni fa
parent
commit
c7fdb72993

+ 64 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/DoubleEleven2021QueryInfo.java

@@ -0,0 +1,64 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+/**
+* @author zx
+* @date 2021/9/26 15:52
+*/
+public class DoubleEleven2021QueryInfo extends QueryInfo {
+
+    private String organId;
+
+    @ApiModelProperty(value = "购买的活动类型1、1v1 20节,2、1v1 40节,3、1v2 20节,4、1v2 40节,5、乐理课",required = false)
+    private Integer type;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    private Boolean giveMemberFlag;
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Boolean getGiveMemberFlag() {
+        return giveMemberFlag;
+    }
+
+    public void setGiveMemberFlag(Boolean giveMemberFlag) {
+        this.giveMemberFlag = giveMemberFlag;
+    }
+}

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupActivityService.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.biz.dal.page.DoubleEleven2021QueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -84,4 +85,13 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
     * @date 2021/10/25 12:07
     */
     Object doubleEleven2021Statis();
+
+    /**
+    * @description: 2021双十一学员购买详情
+     * @param queryInfo
+    * @return java.lang.Object
+    * @author zx
+    * @date 2021/10/26 11:38
+    */
+    Object doubleEleven2021OrderDetail(DoubleEleven2021QueryInfo queryInfo);
 }

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.entity.ActivityApplyStudentType;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.entity.VipGroupCategory;
+import com.ym.mec.biz.dal.page.DoubleEleven2021QueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -362,4 +363,9 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		doubleEleven2021Dto.setGiveMemberNum(vipGroupActivityDao.countGiveMemberNum());
 		return doubleEleven2021Dto;
 	}
+
+	@Override
+	public Object doubleEleven2021OrderDetail(DoubleEleven2021QueryInfo queryInfo) {
+		return null;
+	}
 }

+ 8 - 0
mec-web/src/main/java/com/ym/mec/web/controller/VipGroupActivityController.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
+import com.ym.mec.biz.dal.page.DoubleEleven2021QueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.controller.BaseController;
@@ -56,6 +57,13 @@ public class VipGroupActivityController extends BaseController {
         return succeed(vipGroupActivityService.organDoubleEleven2021Statis(order,sort));
     }
 
+    @ApiOperation(value = "分部2021双11活动学员列表")
+    @GetMapping("/doubleEleven2021OrderDetail")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/doubleEleven2021OrderDetail')")
+    public HttpResponseResult doubleEleven2021OrderDetail(DoubleEleven2021QueryInfo queryInfo){
+        return succeed(vipGroupActivityService.doubleEleven2021OrderDetail(queryInfo));
+    }
+
     @ApiOperation(value = "双11活动统计")
     @GetMapping("/doubleEleven2021Statis")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/doubleEleven2021Statis')")