浏览代码

放开提现回调接口权限校验

liweifan 3 年之前
父节点
当前提交
e697867348

+ 1 - 1
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/config/ResourceServerConfig.java

@@ -33,7 +33,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				.authorizeRequests()
 				.authorizeRequests()
 				.antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
 				.antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
 				.antMatchers("/v2/api-docs", "/code/*","/payment/callback",
 				.antMatchers("/v2/api-docs", "/code/*","/payment/callback",
-                        "/liveRoom/test","/liveRoom/syncUserStatus","/courseGroup/getLockCache","/withdraw/callback","/withdraw/contractCallback")
+                        "/liveRoom/test","/liveRoom/syncUserStatus","/courseGroup/getLockCache","/userWithdrawal/callback","/userWithdrawal/contractCallback")
                 .permitAll().anyRequest().authenticated().and().httpBasic();
                 .permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 	}
 
 

+ 5 - 1
cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysUserContractRecordController.java

@@ -80,12 +80,16 @@ public class SysUserContractRecordController extends BaseController {
 
 
         //未签署协议
         //未签署协议
         if (null == contractRecord) {
         if (null == contractRecord) {
+            contractRecord = new SysUserContractRecord();
             Long contractNo = idGeneratorService.generatorId("contractNo");
             Long contractNo = idGeneratorService.generatorId("contractNo");
             contractRecord.setContractNo(contractNo.toString());
             contractRecord.setContractNo(contractNo.toString());
             contractRecord.setUserId(user.getId());
             contractRecord.setUserId(user.getId());
 
 
             ContractTemplate contractTemplate = contractTemplateService.get(templateId);
             ContractTemplate contractTemplate = contractTemplateService.get(templateId);
-            contractRecord.setContractId(contractTemplate.getId());
+            if(null == contractTemplate){
+                return failed(HttpStatus.FORBIDDEN, "未找到协议");
+            }
+            contractRecord.setContractId(templateId);
 
 
             if (ContractTypeEnum.WITHDRAW.getCode().equals(contractTemplate.getType())) {
             if (ContractTypeEnum.WITHDRAW.getCode().equals(contractTemplate.getType())) {
                 //签署提现协议
                 //签署提现协议