Merge branch '2021-double-eleven' of http://git.dayaedu.com/yonge/mec

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

@@ -54,6 +54,16 @@ public class StudentCourseInfoDto {
     @ApiModelProperty(value = "预计课酬")
     private BigDecimal expectPrice;
 
+    private BigDecimal originalPrice = BigDecimal.ZERO;
+
+    public BigDecimal getOriginalPrice() {
+        return originalPrice;
+    }
+
+    public void setOriginalPrice(BigDecimal originalPrice) {
+        this.originalPrice = originalPrice;
+    }
+
     public StudentCourseInfoDto(String classDate, String startClassTime, String endClassTime) {
         this.classDate = DateUtil.stringToDate(classDate, DateUtil.DEFAULT_PATTERN);
         if (Objects.nonNull(this.classDate) && !StringUtils.isBlank(startClassTime)) {

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

@@ -3514,7 +3514,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 allPrice = allPrice.add(userCourseInfo.getExpectPrice());
                 if(now.after(userCourseInfo.getStartClassTime())){
 					overNum++;
-					historyPrice = historyPrice.add(userCourseInfo.getExpectPrice());
+					if(VIP == userCourseInfo.getGroupType()){
+						historyPrice = historyPrice.add(userCourseInfo.getTeachMode().equals(TeachModeEnum.ONLINE)?vipGroup.getOnlineClassesUnitPrice():vipGroup.getOfflineClassesUnitPrice());
+					}else {
+						historyPrice = historyPrice.add(userCourseInfo.getOriginalPrice());
+					}
                 }
             }
             bigDecimal = allPrice.subtract(historyPrice);

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

@@ -122,6 +122,7 @@
         <result column="actual_teacher_id_" property="actualTeacherId"/>
         <result column="teach_mode_" property="teachMode" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="expect_price_" property="expectPrice"/>
+        <result column="original_price_" property="originalPrice"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentAttendance" id="StudentAttendance">
@@ -2455,7 +2456,9 @@
         cs.end_class_time_,
         cs.actual_teacher_id_,
         cs.teach_mode_,
-        cssp.expect_price_
+        cssp.expect_price_,
+        cs.group_type_,
+        cssp.original_price_
         FROM
         course_schedule cs
         LEFT JOIN course_schedule_student_payment cssp ON cs.id_ = cssp.course_schedule_id_

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -408,7 +408,7 @@
 			AND su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR spo.order_no_ LIKE CONCAT('%',#{search},'%')
 		</if>
 		<if test="organId != null and organId != ''">
-			AND FIND_IN_SET(spo.organId_,#{organId})
+			AND FIND_IN_SET(spo.organ_id_,#{organId})
 		</if>
 		<if test="startTime != null">
 			AND spo.pay_time_ >= #{startTime}