增加乐团获取包含打折金额的商品接口

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

@@ -11,7 +11,7 @@ public class MusicGroupGoodsAndDiscountDto extends Goods {
     private BigDecimal discountRate = BigDecimal.ONE;
 
     @ApiModelProperty(value = "折扣金额", required = true)
-    private BigDecimal discountPrice = BigDecimal.ZERO;
+    private BigDecimal musicGroupDiscountPrice = BigDecimal.ZERO;
 
     public BigDecimal getDiscountRate() {
         return discountRate;
@@ -21,13 +21,11 @@ public class MusicGroupGoodsAndDiscountDto extends Goods {
         this.discountRate = discountRate;
     }
 
-    @Override
-    public BigDecimal getDiscountPrice() {
-        return discountPrice;
+    public BigDecimal getMusicGroupDiscountPrice() {
+        return musicGroupDiscountPrice;
     }
 
-    @Override
-    public void setDiscountPrice(BigDecimal discountPrice) {
-        this.discountPrice = discountPrice;
+    public void setMusicGroupDiscountPrice(BigDecimal musicGroupDiscountPrice) {
+        this.musicGroupDiscountPrice = musicGroupDiscountPrice;
     }
 }

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

@@ -1,12 +1,8 @@
 package com.ym.mec.biz.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.StudentVisitDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
-import com.ym.mec.biz.dal.page.StudentVisitQueryInfo;
 import com.ym.mec.biz.dal.page.SubjectChangeQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
@@ -27,7 +23,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectChange> implements SubjectChangeService {

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupSubjectPlanController.java

@@ -65,7 +65,7 @@ public class MusicGroupSubjectPlanController extends BaseController {
     }
 
 
-    @ApiOperation(value = "获取乐器的折扣")
+    @ApiOperation(value = "获取获取商品和折扣")
     @GetMapping("/getSubjectGoods")
     @PreAuthorize("@pcs.hasPermissions('musicGroupSubjectPlan/getSubjectGoods')")
     @ApiImplicitParams({ @ApiImplicitParam(name = "subjectId", value = "科目编号", required = true, dataType = "Integer"),