Bläddra i källkod

1、屏蔽退课

Joburgess 5 år sedan
förälder
incheckning
e83fd95c2b

+ 2 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupManageDetailDto.java

@@ -94,10 +94,12 @@ public class VipGroupManageDetailDto extends VipGroup {
         this.latestClassTime = latestClassTime;
     }
 
+    @Override
     public Integer getStudentNum() {
         return studentNum;
     }
 
+    @Override
     public void setStudentNum(Integer studentNum) {
         this.studentNum = studentNum;
     }

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/VipGroup.java

@@ -105,7 +105,7 @@ public class VipGroup {
 	private String stopReason;
 
 	@ApiModelProperty(value = "月度消耗百分数")
-	private Double monthConsumeRate;
+	private Integer monthConsumeRate;
 
 	@ApiModelProperty(value = "开课时间")
 	private Date courseStartDate;
@@ -128,11 +128,11 @@ public class VipGroup {
 		this.courseStartDate = courseStartDate;
 	}
 
-	public Double getMonthConsumeRate() {
+	public Integer getMonthConsumeRate() {
 		return monthConsumeRate;
 	}
 
-	public void setMonthConsumeRate(Double monthConsumeRate) {
+	public void setMonthConsumeRate(Integer monthConsumeRate) {
 		this.monthConsumeRate = monthConsumeRate;
 	}
 

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -475,14 +475,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 				Integer totalClassTimes=vipGroup.getTotalClassTimes();
 				if(Objects.isNull(totalClassTimes) || Objects.isNull(overCourses)){
-					vipGroup.setMonthConsumeRate(0.0);
+					vipGroup.setMonthConsumeRate(0);
 				}else{
 					if(totalClassTimes<=0){
-						vipGroup.setMonthConsumeRate((double) 0);
+						vipGroup.setMonthConsumeRate(0);
 					}else{
 						BigDecimal overCoursesOfMonth=new BigDecimal(overCourses),allClassTimes=new BigDecimal(totalClassTimes);
 
-						Double monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP).doubleValue();
+						Integer monthConsumeRate=overCoursesOfMonth.divide(allClassTimes,CommonConstants.DECIMAL_FINAL_PLACE,BigDecimal.ROUND_HALF_UP).intValue();
 						vipGroup.setMonthConsumeRate(monthConsumeRate * 100);
 					}
 				}

+ 4 - 2
mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -202,11 +202,13 @@
     </update>
 
     <delete id="batchDeleteCourseSchedules">
-        DELETE FROM course_schedule cs WHERE id_ IN
+        DELETE FROM course_schedule
+        WHERE
+        CONCAT( class_date_, ' ', start_class_time_ ) &gt; NOW()
+        AND id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
         </foreach>
-        AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &gt; NOW()
     </delete>
 
     <!-- 分页查询 -->