浏览代码

订单导出,零星收费增加乐保服务

周箭河 5 年之前
父节点
当前提交
bd6bd9163b

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

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

+ 5 - 5
mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -46,16 +46,16 @@ public class RepairController extends BaseController {
 
 
     @ApiOperation("获取维修记录详情")
     @ApiOperation("获取维修记录详情")
     @GetMapping(value = "/getRepairInfo")
     @GetMapping(value = "/getRepairInfo")
-    public HttpResponseResult getRepairInfo(Integer id,Integer userId) {
+    public HttpResponseResult getRepairInfo(Integer id,Integer studentId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null && userId== null) {
+        if ((sysUser == null || sysUser.getId() ==null) && studentId == null) {
             return failed("用户信息获取失败");
             return failed("用户信息获取失败");
         }
         }
-        if(sysUser != null){
-            userId = sysUser.getId();
+        if(sysUser.getId() != null){
+            studentId = sysUser.getId();
         }
         }
         StudentRepair repairInfo = studentRepairService.getRepairInfo(id);
         StudentRepair repairInfo = studentRepairService.getRepairInfo(id);
-        if (!repairInfo.getStudentId().equals(userId)) {
+        if (!repairInfo.getStudentId().equals(studentId)) {
             return failed("您的维修记录不存在");
             return failed("您的维修记录不存在");
         }
         }
         return succeed(repairInfo);
         return succeed(repairInfo);