双十一活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/DoubleEleven2021Dto.java

@@ -8,8 +8,6 @@ import java.util.List;
 
 public class DoubleEleven2021Dto {
 
-    List<DoubleEleven2021ActivityDto> activityDtoList;
-
     private Integer organId;
 
     @ApiModelProperty(value = "分部",required = false)
@@ -27,6 +25,116 @@ public class DoubleEleven2021Dto {
     @ApiModelProperty(value = "赠送会员人数",required = false)
     private int giveMemberNum;
 
+    @ApiModelProperty(value = "1v1 20节课购买金额",required = false)
+    private BigDecimal vip1V120Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v1 20节课购买人数",required = false)
+    private int vip1V120Num;
+
+    @ApiModelProperty(value = "1v1 40节课购买金额",required = false)
+    private BigDecimal vip1V140Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v1 40节课购买人数",required = false)
+    private int vip1V140Num;
+
+    @ApiModelProperty(value = "1v2 20节课购买金额",required = false)
+    private BigDecimal vip1V220Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v2 20节课购买人数",required = false)
+    private int vip1V220Num;
+
+    @ApiModelProperty(value = "1v2 40节课购买金额",required = false)
+    private BigDecimal vip1V240Amount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "1v2 40节课购买人数",required = false)
+    private int vip1V240Num;
+
+    @ApiModelProperty(value = "乐理课购买金额",required = false)
+    private BigDecimal musicTheoryAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "乐理课购买人数",required = false)
+    private int musicTheoryNum;
+
+    public BigDecimal getVip1V120Amount() {
+        return vip1V120Amount;
+    }
+
+    public void setVip1V120Amount(BigDecimal vip1V120Amount) {
+        this.vip1V120Amount = vip1V120Amount;
+    }
+
+    public int getVip1V120Num() {
+        return vip1V120Num;
+    }
+
+    public void setVip1V120Num(int vip1V120Num) {
+        this.vip1V120Num = vip1V120Num;
+    }
+
+    public BigDecimal getVip1V140Amount() {
+        return vip1V140Amount;
+    }
+
+    public void setVip1V140Amount(BigDecimal vip1V140Amount) {
+        this.vip1V140Amount = vip1V140Amount;
+    }
+
+    public int getVip1V140Num() {
+        return vip1V140Num;
+    }
+
+    public void setVip1V140Num(int vip1V140Num) {
+        this.vip1V140Num = vip1V140Num;
+    }
+
+    public BigDecimal getVip1V220Amount() {
+        return vip1V220Amount;
+    }
+
+    public void setVip1V220Amount(BigDecimal vip1V220Amount) {
+        this.vip1V220Amount = vip1V220Amount;
+    }
+
+    public int getVip1V220Num() {
+        return vip1V220Num;
+    }
+
+    public void setVip1V220Num(int vip1V220Num) {
+        this.vip1V220Num = vip1V220Num;
+    }
+
+    public BigDecimal getVip1V240Amount() {
+        return vip1V240Amount;
+    }
+
+    public void setVip1V240Amount(BigDecimal vip1V240Amount) {
+        this.vip1V240Amount = vip1V240Amount;
+    }
+
+    public int getVip1V240Num() {
+        return vip1V240Num;
+    }
+
+    public void setVip1V240Num(int vip1V240Num) {
+        this.vip1V240Num = vip1V240Num;
+    }
+
+    public BigDecimal getMusicTheoryAmount() {
+        return musicTheoryAmount;
+    }
+
+    public void setMusicTheoryAmount(BigDecimal musicTheoryAmount) {
+        this.musicTheoryAmount = musicTheoryAmount;
+    }
+
+    public int getMusicTheoryNum() {
+        return musicTheoryNum;
+    }
+
+    public void setMusicTheoryNum(int musicTheoryNum) {
+        this.musicTheoryNum = musicTheoryNum;
+    }
+
     public Integer getOrganId() {
         return organId;
     }
@@ -43,14 +151,6 @@ public class DoubleEleven2021Dto {
         this.organName = organName;
     }
 
-    public List<DoubleEleven2021ActivityDto> getActivityDtoList() {
-        return activityDtoList;
-    }
-
-    public void setActivityDtoList(List<DoubleEleven2021ActivityDto> activityDtoList) {
-        this.activityDtoList = activityDtoList;
-    }
-
     public BigDecimal getAvgBuyAmount() {
         return avgBuyAmount;
     }

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

@@ -216,7 +216,26 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 							doubleEleven2021Dto.getTotalBuyAmount().divide(new BigDecimal(doubleEleven2021Dto.getTotalBuyNum()),2,BigDecimal.ROUND_CEILING));
 				}
 				List<DoubleEleven2021ActivityDto> activityDtos = collect.get(doubleEleven2021Dto.getOrganId());
-				doubleEleven2021Dto.setActivityDtoList(activityDtos);
+				if(activityDtos != null && activityDtos.size() > 0){
+					for (DoubleEleven2021ActivityDto activityDto : activityDtos) {
+						if(activityDto.getType() == 1){
+							doubleEleven2021Dto.setVip1V120Amount(activityDto.getBuyAmount());
+							doubleEleven2021Dto.setVip1V120Num(activityDto.getBuyNum());
+						}else if (activityDto.getType() == 2){
+							doubleEleven2021Dto.setVip1V140Amount(activityDto.getBuyAmount());
+							doubleEleven2021Dto.setVip1V140Num(activityDto.getBuyNum());
+						}else if (activityDto.getType() == 3){
+							doubleEleven2021Dto.setVip1V220Amount(activityDto.getBuyAmount());
+							doubleEleven2021Dto.setVip1V220Num(activityDto.getBuyNum());
+						}else if (activityDto.getType() == 4){
+							doubleEleven2021Dto.setVip1V240Amount(activityDto.getBuyAmount());
+							doubleEleven2021Dto.setVip1V240Num(activityDto.getBuyNum());
+						}else if (activityDto.getType() == 5){
+							doubleEleven2021Dto.setMusicTheoryAmount(activityDto.getBuyAmount());
+							doubleEleven2021Dto.setMusicTheoryNum(activityDto.getBuyNum());
+						}
+					}
+				}
 				Integer giveNum = maps.get(doubleEleven2021Dto.getOrganId());
 				doubleEleven2021Dto.setGiveMemberNum(giveNum);
 			}
@@ -246,51 +265,63 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				}
 			}else if(sort.equals("vip1v120Amount")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V120Amount)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V120Amount).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v140Amount")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V140Amount)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V140Amount).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v220Amount")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V220Amount)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V220Amount).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v240Amount")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V240Amount)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V240Amount).reversed()).collect(Collectors.toList());
+				}
+			}else if(sort.equals("musicTheoryAmount")){
+				if(order.equals("DESC")){
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getMusicTheoryAmount)).collect(Collectors.toList());
+				}else {
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getMusicTheoryAmount).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v120Num")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V120Num)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V120Num).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v140Num")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V140Num)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V140Num).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v220Num")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V220Num)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V220Num).reversed()).collect(Collectors.toList());
 				}
 			}else if(sort.equals("vip1v240Num")){
 				if(order.equals("DESC")){
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum)).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V240Num)).collect(Collectors.toList());
 				}else {
-					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getGiveMemberNum).reversed()).collect(Collectors.toList());
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getVip1V240Num).reversed()).collect(Collectors.toList());
+				}
+			}else if(sort.equals("musicTheoryNum")){
+				if(order.equals("DESC")){
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getMusicTheoryNum)).collect(Collectors.toList());
+				}else {
+					doubleEleven2021Dtos = doubleEleven2021Dtos.stream().sorted(Comparator.comparing(DoubleEleven2021Dto::getMusicTheoryNum).reversed()).collect(Collectors.toList());
 				}
 			}
 		}
@@ -306,7 +337,27 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 					doubleEleven2021Dto.getTotalBuyAmount().divide(new BigDecimal(doubleEleven2021Dto.getTotalBuyNum()),2,BigDecimal.ROUND_CEILING));
 		}
 		//获取活动成交数据
-		doubleEleven2021Dto.setActivityDtoList(vipGroupActivityDao.countActivityStatis());
+		List<DoubleEleven2021ActivityDto> activityDtos = vipGroupActivityDao.countActivityStatis();
+		if(activityDtos != null && activityDtos.size() > 0){
+			for (DoubleEleven2021ActivityDto activityDto : activityDtos) {
+				if(activityDto.getType() == 1){
+					doubleEleven2021Dto.setVip1V120Amount(activityDto.getBuyAmount());
+					doubleEleven2021Dto.setVip1V120Num(activityDto.getBuyNum());
+				}else if (activityDto.getType() == 2){
+					doubleEleven2021Dto.setVip1V140Amount(activityDto.getBuyAmount());
+					doubleEleven2021Dto.setVip1V140Num(activityDto.getBuyNum());
+				}else if (activityDto.getType() == 3){
+					doubleEleven2021Dto.setVip1V220Amount(activityDto.getBuyAmount());
+					doubleEleven2021Dto.setVip1V220Num(activityDto.getBuyNum());
+				}else if (activityDto.getType() == 4){
+					doubleEleven2021Dto.setVip1V240Amount(activityDto.getBuyAmount());
+					doubleEleven2021Dto.setVip1V240Num(activityDto.getBuyNum());
+				}else if (activityDto.getType() == 5){
+					doubleEleven2021Dto.setMusicTheoryAmount(activityDto.getBuyAmount());
+					doubleEleven2021Dto.setMusicTheoryNum(activityDto.getBuyNum());
+				}
+			}
+		}
 		//获取赠送会员数
 		doubleEleven2021Dto.setGiveMemberNum(vipGroupActivityDao.countGiveMemberNum());
 		return doubleEleven2021Dto;