yonge před 3 roky
rodič
revize
08fed152ad

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeBuyResultDto.java

@@ -30,6 +30,8 @@ public class PracticeBuyResultDto {
     private String type;
 
     private Object detail;
+    
+    private Integer courseNum;
 
     public String getOrderNo() {
         return orderNo;
@@ -110,4 +112,12 @@ public class PracticeBuyResultDto {
     public void setDetail(Object detail) {
         this.detail = detail;
     }
+
+	public Integer getCourseNum() {
+		return courseNum;
+	}
+
+	public void setCourseNum(Integer courseNum) {
+		this.courseNum = courseNum;
+	}
 }

+ 0 - 10
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/PracticeGroup.java

@@ -58,8 +58,6 @@ public class PracticeGroup {
 	/**  */
 	private String memo;
 	
-	private Integer courseTimes;
-
 	private Integer buyMonths;
 
 	private Integer drillTimesOnWeek;
@@ -191,14 +189,6 @@ public class PracticeGroup {
 		this.groupStatus = groupStatus;
 	}
 
-	public Integer getCourseTimes() {
-		return courseTimes;
-	}
-
-	public void setCourseTimes(Integer courseTimes) {
-		this.courseTimes = courseTimes;
-	}
-
 	public Integer getBuyMonths() {
 		return buyMonths;
 	}

+ 4 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -2835,7 +2835,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if (Objects.isNull(practiceGroupBuyParams.getSubjectId())) {
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择声部");
         }
-        if (Objects.isNull(practiceGroupBuyParams.getCourseTimes())) {
+        if (Objects.isNull(practiceGroupBuyParams.getAllCourseNum())) {
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择需要购买的课时数");
         }
         if (Objects.isNull(practiceGroupBuyParams.getDrillTimesOnWeek())) {
@@ -2989,7 +2989,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         } else {
             oneMonthPrice = practiceGroupBuyParams.getDrillTimesOnWeek() == 1 ? practiceGroupSellPrice.getOnceOriginalPrice() : practiceGroupSellPrice.getTwiceOriginalPrice();
         }*/
-        BigDecimal amount = oneMonthPrice.multiply(new BigDecimal(practiceGroupBuyParams.getCourseTimes()));
+        BigDecimal amount = oneMonthPrice.multiply(new BigDecimal(practiceGroupBuyParams.getAllCourseNum()));
 
         practiceGroupBuyParams.setDrillTimesJson(drillTimesObject.toJSONString());
         practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
@@ -4381,6 +4381,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(Objects.nonNull(practiceGroup.getType())&&(PracticeGroupType.CARE_PACKAGE.equals(practiceGroup.getType())||PracticeGroupType.COME_ON_PACKAGE.equals(practiceGroup.getType()))){
             practiceCourseMinutes = 50;
         }
+        
+        practiceBuyResult.setCourseNum(practiceGroup.getAllCourseNum());
 
         if(StringUtils.isNotEmpty(practiceGroup.getDrillTimesJson())){
             JSONArray coursesArry = new JSONArray();