Merge remote-tracking branch 'origin/saas' into saas

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

@@ -26,7 +26,8 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/task/**", "/user/updatePassword", "/user/noAuth/queryUserByPhone", "/user/queryUserByPhone", "/user/add", "/user/queryUserById/*").hasIpAddress("0.0.0.0/0")
+				.authorizeRequests().antMatchers("/task/**", "/user/updatePassword", "/user/noAuth/queryUserByPhone",
+				"/user/queryUserByPhone", "/user/add", "/user/queryUserById/*","/queryUserInfo").hasIpAddress("0.0.0.0/0")
 				.anyRequest().authenticated().and().httpBasic();
 	}
 

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

@@ -3,6 +3,7 @@ package com.ym.mec.auth.config;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.ym.mec.auth.interceptor.TenantInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.context.annotation.Bean;
@@ -13,7 +14,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import com.ym.mec.auth.interceptor.OperationLogInterceptor;
-import com.ym.mec.auth.interceptor.TenantInterceptor;
 import com.ym.mec.common.config.EnumConverterFactory;
 import com.ym.mec.common.config.LocalFastJsonHttpMessageConverter;
 
@@ -36,7 +36,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/queryUserInfo");
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/userDevice/unbind").excludePathPatterns("/*");
 	}
 	

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -75,7 +75,9 @@ public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProces
 		loginEntity.setIsRegister(isRegister);
 		loginEntity.setDeviceNum(deviceNum);
 		loginEntity.setOrganId(organId);
-		loginEntity.setTenantId(Integer.parseInt(tenantId));
+		if(StringUtils.isNotEmpty(tenantId)){
+			loginEntity.setTenantId(Integer.parseInt(tenantId));
+		}
 
 		authRequest = new PhoneAuthenticationToken(SecurityConstants.PHONE_PRINCIPAL_PREFIX + principal, loginEntity);
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysMenuDao.java

@@ -26,12 +26,6 @@ public interface SysMenuDao extends BaseDAO<Integer, SysMenu> {
     List<SysMenu> findByUser(Integer userId);
 
     /**
-     * 根据权限标识查菜单
-     * @return
-     */
-    SysMenu findMenuByPermission(@Param("permission") String permission);
-
-    /**
      * 获取用户菜单树状结构
      * @param menuId
      * @param delFlag

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysMenuService.java

@@ -23,13 +23,6 @@ public interface SysMenuService extends BaseService<Integer, SysMenu> {
     List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo);
 
     /**
-     * 根据权限标识查菜单
-     * @param permission
-     * @return
-     */
-    SysMenu findMenuByPermission(String permission);
-
-    /**
      * 删除菜单列表，包含所有子节点
      * @param id
      */

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -33,21 +33,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		return sysMenuDao.getMenusByRoleId(roleId);
 	}
 
-	public List<SysMenu> findByUser1(MenuQueryInfo menuQueryInfo) {
-		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
-		List<SysMenu> sysMenus = null;
-		if(sysUser.getIsSuperAdmin()){
-			menuQueryInfo.setUserId(null);
-			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
-		}else {
-			sysMenus = sysMenuDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
-		}
-		for (SysMenu menu:sysMenus) {
-			menu = getTree(menu,menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
-		}
-		return sysMenus;
-	}
-
 	public List<SysMenu> findByUser(MenuQueryInfo menuQueryInfo) {
 		SysUser sysUser = sysUserDao.get(menuQueryInfo.getUserId());
 		List<SysMenu> sysMenus;
@@ -105,11 +90,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 	}
 
 	@Override
-	public SysMenu findMenuByPermission(String permission){
-		return sysMenuDao.findMenuByPermission(permission);
-	}
-
-	@Override
 	public void recursiveDel(Integer parentId) {
 		List<SysMenu> sysMenus = sysMenuDao.findList(parentId, "0",0);
 		for (SysMenu menu:sysMenus) {

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -139,10 +139,6 @@
 		WHERE sur.user_id_ = #{userId} AND sr.del_flag_ = 0 AND sm.del_flag_ = 0
 	</select>
 
-    <!-- 根据权限标识查菜单 -->
-    <select id="findMenuByPermission" resultMap="SysMenu">
-        SELECT * FROM `sys_menu` WHERE `permission_` = #{permission} AND del_flag_ = 0
-    </select>
     <sql id="queryTree">
         <where>
             <if test="userId != null">

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

@@ -22,7 +22,7 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 public class MusicGroupSubjectGoodsAndInfoDto {
 
     //课程信息
-    private Map CourseScheduleInfo;
+    private Map paymentCalender;
 
     //乐团声部商品信息
     private List<MusicGroupSubjectGoodsGroup> musicGroupSubjectGoodsGroupList;
@@ -36,33 +36,33 @@ public class MusicGroupSubjectGoodsAndInfoDto {
     //其他商品（教材、琴谱）
     private List<Goods> otherGoods;
 
-    @ApiModelProperty(value = "乐团报名缴费日历",required = false)
-    private MusicGroupPaymentCalender musicGroupPaymentCalender;
+//    @ApiModelProperty(value = "乐团报名缴费日历",required = false)
+//    private MusicGroupPaymentCalender musicGroupPaymentCalender;
 
     @ApiModelProperty(value = "乐团信息",required = false)
     private MusicGroup musicGroup;
 
-    @ApiModelProperty(value = "乐团云教练价格",required = false)
-    private BigDecimal cloudTeacherFee;
+//    @ApiModelProperty(value = "乐团云教练价格",required = false)
+//    private BigDecimal cloudTeacherFee;
 
-    @ApiModelProperty(value = "乐团云教练+价格",required = false)
-    private BigDecimal cloudTeacherPlusFee;
+//    @ApiModelProperty(value = "乐团云教练+价格",required = false)
+//    private BigDecimal cloudTeacherPlusFee;
     
-    @ApiModelProperty(value = "会员权益",required = false)
-    private List<MemberPrivilegesItem> memberPrivilegesItemList;
+//    @ApiModelProperty(value = "会员权益",required = false)
+//    private List<MemberPrivilegesItem> memberPrivilegesItemList;
     
     private List<StudentPaymentOrderDetail> studentPaymentOrderDetailList;
-    
-    private Map<String, BigDecimal> memberCoursePrice = new HashMap<String, BigDecimal>();
 
-    public Map getCourseScheduleInfo() {
-        return CourseScheduleInfo;
+    public Map getPaymentCalender() {
+        return paymentCalender;
     }
 
-    public void setCourseScheduleInfo(Map courseScheduleInfo) {
-        CourseScheduleInfo = courseScheduleInfo;
+    public void setPaymentCalender(Map paymentCalender) {
+        this.paymentCalender = paymentCalender;
     }
 
+    //    private Map<String, BigDecimal> memberCoursePrice = new HashMap<String, BigDecimal>();
+
     public List<MusicGroupSubjectGoodsGroup> getMusicGroupSubjectGoodsGroupList() {
         return musicGroupSubjectGoodsGroupList;
     }
@@ -95,14 +95,6 @@ public class MusicGroupSubjectGoodsAndInfoDto {
         this.studentGoods = studentGoods;
     }
 
-    public MusicGroupPaymentCalender getMusicGroupPaymentCalender() {
-        return musicGroupPaymentCalender;
-    }
-
-    public void setMusicGroupPaymentCalender(MusicGroupPaymentCalender musicGroupPaymentCalender) {
-        this.musicGroupPaymentCalender = musicGroupPaymentCalender;
-    }
-
     public MusicGroup getMusicGroup() {
         return musicGroup;
     }
@@ -111,30 +103,6 @@ public class MusicGroupSubjectGoodsAndInfoDto {
         this.musicGroup = musicGroup;
     }
 
-    public BigDecimal getCloudTeacherFee() {
-        return cloudTeacherFee;
-    }
-
-    public void setCloudTeacherFee(BigDecimal cloudTeacherFee) {
-        this.cloudTeacherFee = cloudTeacherFee;
-    }
-
-    public BigDecimal getCloudTeacherPlusFee() {
-        return cloudTeacherPlusFee;
-    }
-
-    public void setCloudTeacherPlusFee(BigDecimal cloudTeacherPlusFee) {
-        this.cloudTeacherPlusFee = cloudTeacherPlusFee;
-    }
-
-	public List<MemberPrivilegesItem> getMemberPrivilegesItemList() {
-		return memberPrivilegesItemList;
-	}
-
-	public void setMemberPrivilegesItemList(List<MemberPrivilegesItem> memberPrivilegesItemList) {
-		this.memberPrivilegesItemList = memberPrivilegesItemList;
-	}
-
 	public List<StudentPaymentOrderDetail> getStudentPaymentOrderDetailList() {
 		return studentPaymentOrderDetailList;
 	}
@@ -142,12 +110,4 @@ public class MusicGroupSubjectGoodsAndInfoDto {
 	public void setStudentPaymentOrderDetailList(List<StudentPaymentOrderDetail> studentPaymentOrderDetailList) {
 		this.studentPaymentOrderDetailList = studentPaymentOrderDetailList;
 	}
-
-	public Map<String, BigDecimal> getMemberCoursePrice() {
-		return memberCoursePrice;
-	}
-
-	public void setMemberCoursePrice(Map<String, BigDecimal> memberCoursePrice) {
-		this.memberCoursePrice = memberCoursePrice;
-	}
 }

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

@@ -14,12 +14,6 @@ public class RegisterPayDto extends PayParamBasicDto{
     private BigDecimal amount;
     //报名id
     private Integer registerId;
-    //打包商品ids（废弃）
-    private String goodsGroupIds;
-    //单独商品ids（废弃）
-    private String goodsIds;
-    //教谱ids（废弃）
-    private String otherGoodsIds;
     //乐器id->type
     private Map<Long, String> goodsGroups;
 
@@ -46,21 +40,6 @@ public class RegisterPayDto extends PayParamBasicDto{
         this.registerId = registerId;
     }
 
-    public String getGoodsGroupIds() {
-        return goodsGroupIds;
-    }
-
-    public void setGoodsGroupIds(String goodsGroupIds) {
-        this.goodsGroupIds = goodsGroupIds;
-    }
-
-    public String getGoodsIds() {
-        return goodsIds;
-    }
-
-    public void setGoodsIds(String goodsIds) {
-        this.goodsIds = goodsIds;
-    }
 
     public BigDecimal getAmount() {
         return amount;
@@ -70,14 +49,6 @@ public class RegisterPayDto extends PayParamBasicDto{
         this.amount = amount;
     }
 
-    public String getOtherGoodsIds() {
-        return otherGoodsIds;
-    }
-
-    public void setOtherGoodsIds(String otherGoodsIds) {
-        this.otherGoodsIds = otherGoodsIds;
-    }
-
     public Map<Long, String> getGoodsGroups() {
         return goodsGroups;
     }

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

@@ -1,6 +1,8 @@
 package com.ym.mec.biz.service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import com.ym.mec.biz.dal.dto.*;
@@ -30,7 +32,7 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param id
 	 * @return
 	 */
-	Object getDetail(Long id);
+	Map<String, Object> getDetail(Long id);
 	
 	/**
 	 * 更新缴费信息
@@ -192,4 +194,6 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	* @date 2021/12/27 20:43
 	*/
     String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
+
+    MusicGroupPaymentCalender getMusicGroupRegCalender(String musicGroupId);
 }

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

@@ -121,7 +121,6 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
                                  BigDecimal amount,
                                  String orderNo,
                                  String paymentChannel,
-                                 BigDecimal courseFee,
                                  List<MusicGroupSubjectGoodsGroup> goodsGroups,
                                  BigDecimal remitFee,
                                  BigDecimal courseRemitFee,

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

@@ -677,7 +677,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
-	public Object getDetail(Long id) {
+	public Map<String, Object> getDetail(Long id) {
 		Map<String, Object> result = new HashMap<>(9);
 		//获取缴费项目详情
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(id);
@@ -1675,6 +1675,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     }
 
     @Override
+    public MusicGroupPaymentCalender getMusicGroupRegCalender(String musicGroupId) {
+		return musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroupId);
+    }
+
+    @Override
 	@Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		Date date = new Date();

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

@@ -27,6 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
@@ -672,6 +673,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if(musicGroupRegCalender == null){
         	throw new BizException("缴费信息不存在");
         }
+        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
+        if(musicGroup == null){
+            throw new BizException("查询乐团信息失败");
+        }
         Integer tenantId = TenantContextHolder.getTenantId();
 
         Integer userId = studentRegistration.getUserId();
@@ -680,19 +685,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         BigDecimal orderAmount = new BigDecimal("0");
 
         //获取课程价格
-        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
-        BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
-        orderAmount = orderAmount.add(courseFee);
+//        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
+//        BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
+//        orderAmount = orderAmount.add(courseFee);
 
         BigDecimal remitFee = BigDecimal.ZERO; //乐器减免金额
         BigDecimal courseRemitFee = BigDecimal.ZERO; //课程减免费用
         boolean remitCourseRFeeFlag = false; //减免课程费用标识
 
-        MusicGroup musicGroup = musicGroupDao.get(studentRegistration.getMusicGroupId());
-        if(musicGroup == null){
-        	throw new BizException("查询乐团信息失败");
-        }
-
         //乐器及打包辅件
         List<MusicGroupSubjectGoodsGroup> goodsGroups = new ArrayList<>();
         if (registerPayDto.getGoodsGroups() != null && registerPayDto.getGoodsGroups().size() > 0) {
@@ -700,8 +700,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             goodsGroups = musicGroupSubjectGoodsGroupService.findGoodsGroupByIds(goodsGroupIds);
         }
         for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
-            Map<String, BigDecimal> groupType = JSONObject.parseObject(goodsGroup.getKitGroupPurchaseTypeJson(), new TypeReference<Map<String, BigDecimal>>() {
-            });
+            Map<String, BigDecimal> groupType = JSONObject.parseObject(goodsGroup.getKitGroupPurchaseTypeJson(), new TypeReference<Map<String, BigDecimal>>() {});
 
             if (goodsGroup.getType().equals(GoodsType.INSTRUMENT)) {
                 String kitGroupPurchaseType = registerPayDto.getGoodsGroups().get(goodsGroup.getId());
@@ -804,7 +803,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 orderAmount,
                 orderNo,
                 channelType,
-                courseFee,
                 goodsGroups,
                 remitFee,
                 courseRemitFee,
@@ -918,6 +916,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         return payMap;
     }
 
+    private BigDecimal getCalenderAmount(Long calenderId,Function<Long,BigDecimal> func){
+        return func.apply(calenderId);
+    }
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map rePay(RegisterPayDto registerPayDto) throws Exception {
@@ -965,9 +969,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         BigDecimal orderAmount = new BigDecimal("0");
 
         //获取课程价格
-        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
-        BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
-        orderAmount = orderAmount.add(courseFee);
+//        MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
+//        BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
+//        orderAmount = orderAmount.add(courseFee);
 
         BigDecimal remitFee = BigDecimal.ZERO;
         BigDecimal courseRemitFee = BigDecimal.ZERO; //课程减免费用
@@ -1090,7 +1094,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 orderAmount,
                 orderNo,
                 channelType,
-                courseFee,
                 goodsGroups,
                 remitFee,
                 courseRemitFee,

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

@@ -67,7 +67,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Autowired
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
     @Autowired
-    private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
+    private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
     @Autowired
     private OrganizationCloudTeacherFeeDao organizationCloudTeacherFeeDao;
 
@@ -120,17 +120,10 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         if(StringUtils.isEmpty(configValue)){
             throw new BizException("请配置会员团每学期赠送课程分钟数");
         }
-        Integer giveCourseTime = Integer.parseInt(configValue)>>1;
+//        Integer giveCourseTime = Integer.parseInt(configValue)>>1;
 
         //课程形态
-        Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
-
-        //新的课程形态10.27
-        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.getMusicGroupRegCalender(musicGroupId);
-        if (musicGroupRegCalender != null) {
-            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
-            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
-        }
+//        Map<String, Object> courseForm = JSON.parseObject(musicGroup.getCourseForm(), Map.class);
 
         //乐团计划及收费信息
         MusicGroupSubjectPlan musicOneSubjectClassPlan = this.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
@@ -154,11 +147,18 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
         //获取声部（科目）下其他商品
         MusicGroupSubjectGoodsAndInfoDto musicGroupSubjectGoodsAndInfo = new MusicGroupSubjectGoodsAndInfoDto();
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectPlan(musicOneSubjectClassPlan);
-        musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
-        musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
+//        musicGroupSubjectGoodsAndInfo.setCourseScheduleInfo(courseForm);
+//        musicGroupSubjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
         musicGroupSubjectGoodsAndInfo.setMusicGroupSubjectGoodsGroupList(goodsGroups);
         musicGroupSubjectGoodsAndInfo.setMusicGroup(musicGroup);
-		if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCloudTeacherType() != null) {
+        //新的课程形态10.27
+        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.getMusicGroupRegCalender(musicGroupId);
+        if (musicGroupRegCalender != null) {
+//            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getMusicGroupRegCalenderCourseSettings(musicGroupId);
+//            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+            musicGroupSubjectGoodsAndInfo.setPaymentCalender(musicGroupPaymentCalenderService.getDetail(musicGroupRegCalender.getId()));
+        }
+		/*if (musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) || musicGroup.getCloudTeacherType() != null) {
 			// 历史数据
 			if (musicGroup.getCloudTeacherType() != null) {
 				OrganizationCloudTeacherFee cloudTeacherFee = organizationCloudTeacherFeeDao.getByOrganId(musicGroup.getOrganId());
@@ -192,7 +192,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
 			}
 			
 			musicGroupSubjectGoodsAndInfo.setMemberCoursePrice(memberCoursePrice);
-		}
+		}*/
 		
 		// 查询已购买内容
         SysUser sysUser = sysUserFeignService.queryUserInfo();

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

@@ -5417,12 +5417,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
             }
         }
-        if(!"36".equals(user.getOrganId())){
-            try {
-                contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-            } catch (Exception e) {
-                LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
-            }
+        try {
+            contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+        } catch (Exception e) {
+            LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
         }
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");

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

@@ -581,7 +581,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public StudentPaymentOrder addOrder(StudentRegistration studentRegistration, BigDecimal amount, String orderNo, String paymentChannel,
-                                        BigDecimal courseFee, List<MusicGroupSubjectGoodsGroup> goodsGroups, BigDecimal remitFee, BigDecimal courseRemitFee,
+                                        List<MusicGroupSubjectGoodsGroup> goodsGroups, BigDecimal remitFee, BigDecimal courseRemitFee,
                                         List<MusicGroupPaymentCalenderCourseSettings> newCourses, Boolean buyMaintenance, Boolean buyCloudTeacher, Boolean buyCloudTeacherPlus,List<Integer> couponIdList) throws Exception {
         Date date = new Date();
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(couponIdList,amount,true);

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

@@ -2705,18 +2705,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		BigDecimal amount=studentPaymentOrder.getActualAmount();
 		BigDecimal balance = BigDecimal.ZERO;
-		if("36".equals(user.getOrganId())){
-			studentPaymentRouteOrderService.addRouteOrder(orderNo, vipGroup.getOrganId(), amount);
-			studentPaymentOrder.setPaymentChannel("BALANCE");
-			studentPaymentOrder.setActualAmount(new BigDecimal(0));
-			studentPaymentOrder.setBalancePaymentAmount(amount);
-			studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-			studentPaymentOrder.setUpdateTime(date);
-			this.orderCallback(studentPaymentOrder);
-			Map<String,Object> result=new HashMap<>();
-			result.put("orderNo",studentPaymentOrder.getOrderNo());
-			return BaseController.succeed(result);
-		}else if(vipGroupBuyParams.isUseBalancePayment() || amount.doubleValue() == 0){
+		if(vipGroupBuyParams.isUseBalancePayment() || amount.doubleValue() == 0){
 			SysUserCashAccount userCashAccount = sysUserCashAccountService.getLocked(user.getId());
 			if(userCashAccount == null){
 				throw new BizException("用户账户找不到");
@@ -2752,12 +2741,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 		}
-		if(!"36".equals(user.getOrganId())){
-			try {
-				contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
-			} catch (Exception e) {
-				LOGGER.error("[{}]小课购买协议生成错误：{}", vipGroup.getId(), e.getCause());
-			}
+		try {
+			contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
+		} catch (Exception e) {
+			LOGGER.error("[{}]小课购买协议生成错误：{}", vipGroup.getId(), e.getCause());
 		}
 
 		String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");

mec-im/src/main/java/com/ym/config/WebMvcConfig.java

@@ -54,7 +54,10 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**");
+		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").excludePathPatterns("/v2/api-docs","/user/register",
+				"/group/join","/group/create","/group/quit","/room/leave","/room/statusSync",
+				"/room/statusImMsg","/group/batchDismiss","/private/send","/group/send",
+				"/group/dismiss","/room/statusImMsg","/history/get");
 	}
 
 	@SuppressWarnings("rawtypes")

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -151,7 +151,6 @@ public class MusicGroupController extends BaseController {
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "subjectId", value = "声部编号", required = true, dataType = "Integer")})
     public HttpResponseResult<MusicGroupSubjectGoodsAndInfoDto> getSubjectGoodsAndInfo(String musicGroupId, Integer subjectId) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
         return succeed(musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId));
     }
 
@@ -354,9 +353,7 @@ public class MusicGroupController extends BaseController {
             PayStatus payStatus = studentPaymentOrderService.queryPayStatus(applyOrder.getPaymentChannel(), applyOrder.getOrderNo(), applyOrder.getTransNo());
             if(payStatus == PayStatus.SUCCESSED){
         		throw new BizException("订单已支付成功，请勿重复支付");
-        	}/*else if(payStatus == PayStatus.PAYING){
-        		throw new BizException("订单还在交易中，请稍后重试");
-        	}*/
+        	}
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
         Map payMap = musicGroupService.pay(registerPayDto);

mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -225,12 +225,12 @@ public class StudentRegistrationController extends BaseController {
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         MusicGroupSubjectGoodsAndInfoDto subjectGoodsAndInfo = musicGroupSubjectPlanService.getSubjectGoodsAndInfo(musicGroupId, subjectId);
 
-        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.get(calenderId);
-        if (musicGroupRegCalender != null && musicGroupRegCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)) {
-            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getWithPaymentCalender(musicGroupRegCalender.getId());
-            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
-            subjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
-        }
+//        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderDao.get(calenderId);
+//        if (musicGroupRegCalender != null && musicGroupRegCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)) {
+//            List<MusicGroupPaymentCalenderCourseSettings> courseSettings = musicGroupPaymentCalenderCourseSettingsDao.getWithPaymentCalender(musicGroupRegCalender.getId());
+//            musicGroupRegCalender.setMusicGroupPaymentCalenderCourseSettingsList(courseSettings);
+//            subjectGoodsAndInfo.setMusicGroupPaymentCalender(musicGroupRegCalender);
+//        }
         subjectGoodsAndInfo.setMusicGroup(musicGroup);
         return succeed(subjectGoodsAndInfo);
     }