Merge branch 'vip_price_827' into online1

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PeriodEnum.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 周期
  */
 public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
-	DAY("日"), MONTH("月"), YEAR_HALF("半年"), YEAR("年");
+	DAY("日"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
 
 	private String msg;
 

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

@@ -165,6 +165,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			cloudTeacherOrder.setType(2);
 			cloudTeacherOrder.setTime(1);
 			break;
+		case QUARTERLY:
+			actualAmount = memberFeeSetting.getCurrentQuarterlyFee();
+			cloudTeacherOrder.setType(2);
+			cloudTeacherOrder.setTime(3);
+			break;
 		case YEAR_HALF:
 			actualAmount = memberFeeSetting.getCurrentHalfYearFee();
 			cloudTeacherOrder.setType(2);