Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/AuthorizationServerConfig.java

@@ -72,8 +72,8 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap
 		DefaultTokenServices tokenServices = new DefaultTokenServices();
 		tokenServices.setTokenStore(redisTokenStore());
 		tokenServices.setSupportRefreshToken(true);
-		tokenServices.setAccessTokenValiditySeconds(60 * 60 * 24); // token有效期自定义设置，默认12小时
-		tokenServices.setRefreshTokenValiditySeconds(60 * 60 * 24 * 30);// 默认30天，这里修改
+		//tokenServices.setAccessTokenValiditySeconds(60 * 60 * 24); // token有效期自定义设置，默认12小时
+		//tokenServices.setRefreshTokenValiditySeconds(60 * 60 * 24 * 30);// 默认30天，这里修改
 		return tokenServices;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -18,26 +18,11 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     public static final String VIP_APPEAL_DAYS_RANGE = "vip_appeal_days_range";
 
     /**
-     * VIP课的结算周期，为课程完成后{}天
-     */
-    public static final String VIP_SETTLEMENT_CYCLE = "vip_settlement_cycle";
-
-    /**
-     * 课酬结算周期，为每个月的{}日
-     */
-    public static final String COURSES_SETTLEMENT_CYCLE = "courses_settlement_cycle";
-
-    /**
      * 老师正常打卡时间，为课程当天，距离开课时间前{}分钟
      */
     public static final String ADVANCE_SIGN_IN_MINUTES = "advance_sign_in_minutes";
 
     /**
-     * 乐团课，签退时间，为课程结束后开始，至结束后的{}小时
-     */
-    public static final String SIGN_OUT_DELAY_HOURS = "sign_out_delay_hours";
-
-    /**
      * 老师可以打卡范围，为教学定位方圆{}米
      */
     public static final String ATTENDANCE_RANGE = "attendance_range";
@@ -48,16 +33,6 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     public static final String ADVANCE_LEAVE_HOURS = "advance_leave_hours";
 
     /**
-     * 移动端「课程调整」调整的课程时间，为开课前{}天
-     */
-    public static final String ADVANCE_UPDATE_COURSES_DAYS = "advance_update_courses_days";
-
-    /**
-     * 密码重置后的默认密码为{}
-     */
-    public static final String DEFAULT_PASSWORD = "default_password";
-
-    /**
      * 单技课梯度结算规则设置
      */
     public static final String SIGLE_GRADIENT_SETTLEMENT_RULE = "sigle_gradient_settlement_rule";
@@ -83,14 +58,8 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String DEMO_GROUP_SINGLE_CLASS_MINUTES_ = "demo_group_single_class_minutes_";
     String USER_DEFAULT_HEAD_URL = "user_default_head_url";
     String STUDENT_APPLY_URL = "student_apply_url";
-    String STUDENT_APPLY_PAYMENT_DETAIL_URL = "student_apply_payment_detail_url";
     String SERVER_PHONE = "server_phone";
 
-    /**
-     * 乐团课90分钟课酬计算时的收费类型
-     */
-    String MUSIC_GROUP_CHARGE_TYPE_90_ = "music_group_charge_type_90_";
-
     String MUSIC_GROUP_SETTLEMENT_CLASS_MINUTES = "music_group_settlement_class_minutes";
 
     String MUSIC_GROUP_SETTLEMENT_SINGLE_CLASS_MINUTES = "music_group_settlement_single_class_minutes";

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

@@ -1,17 +1,20 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.entity.MusicGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.service.MusicGroupStudentFeeService;
 import com.ym.mec.biz.service.SysConfigService;
@@ -52,7 +55,7 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 		List<MusicGroupStudentFee> musicGroupStudentFeeList = musicGroupStudentFeeDao.queryWillRenewList(days);
 
 		for (MusicGroupStudentFee musicGroupStudentFee : musicGroupStudentFeeList) {
-			if (musicGroupStudentFee.getPaymentStatus() == PaymentStatus.PAID_COMPLETED && musicGroupStudentFee.getCourseFee().doubleValue() > 0) {
+			if (musicGroupStudentFee.getPaymentStatus() == PaymentStatus.PAID_COMPLETED && (musicGroupStudentFee.getCourseFee() != null && musicGroupStudentFee.getCourseFee().doubleValue() > 0)) {
 				musicGroupStudentFee.setPaymentStatus(PaymentStatus.NON_PAYMENT);
 				musicGroupStudentFee.setUpdateTime(date);
 				updateList.add(musicGroupStudentFee);