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

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -25,7 +25,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
-				.authorizeRequests().antMatchers("/v2/api-docs","/code/*","/register/*","/studentOrder/*","/musicGroup/getSubjectGoodsAndInfo","/musicGroup/getMusicGroupStatus","/musicGroup/getOrderStatus","/musicGroup/pay","/musicGroup/rePay","/studentManage/queryStudentPer").permitAll().anyRequest().authenticated().and().httpBasic();
+				.authorizeRequests().antMatchers("/v2/api-docs","/code/*","/register/*","/studentOrder/*","/musicGroup/getSubjectGoodsAndInfo",
+				"/musicGroup/getMusicGroupStatus","/musicGroup/getOrderStatus",
+				"/musicGroup/pay","/musicGroup/rePay","/studentManage/queryStudentPer","/sporadicChargeInfo/get").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -40,13 +40,13 @@ public class SporadicChargeInfoController extends BaseController {
 	@ApiOperation(value = "单查询")
 	@GetMapping("/get")
 	public Object get(Integer id) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户不存在");
-		}
+//		SysUser sysUser = sysUserFeignService.queryUserInfo();
+//		if (sysUser == null) {
+//			return failed("用户不存在");
+//		}
 		SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
 		if(chargeInfo != null){
-			SysUserCashAccount locked = sysUserCashAccountDao.getLocked(sysUser.getId());
+			SysUserCashAccount locked = sysUserCashAccountDao.getLocked(chargeInfo.getUserId());
 			chargeInfo.setBalance(locked.getBalance());
 		}else {
 			throw new BizException("信息不存在");