LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 报名流程

Browse Source
This commit is contained in:
lijiarao
2021-12-15 16:47:35 +08:00
parent 4c7aa89287
commit 44acf33164
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+2 -2
View File
@@ -108,8 +108,8 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/company/jscode2session", "anon");//微信登录凭证校验
//和会员系统交互的接口
filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件
//filterChainDefinitionMap.put("/meeting/payMeeting/addStandards","anon");//会员系统推送会议
//filterChainDefinitionMap.put("/meeting/payMeeting/addStandardsFile","anon");//会员系统推送文件
filterChainDefinitionMap.put("/meeting/payMeetingSituation/page2","anon");//查询参会人
filterChainDefinitionMap.put("/sys/user/payUserList","anon");//查询负责人
filterChainDefinitionMap.put("/meeting/payMeeting/createBase64","anon");//生成二维码
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+3 -6
View File
@@ -410,9 +410,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
*/
@PostMapping(value = "/addStandards")
public Result<?> addStandards(@RequestBody PayMeeting payMeeting, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
String token = request.getParameter("token");
authenticationUtils.check(token, publicKey);
//String publicKey = request.getParameter("publicKey");
//String token = request.getParameter("token");
//authenticationUtils.check(token, publicKey);
payMeetingService.addStandards(payMeeting);
return Result.OK("合并开票成功!");
@@ -423,9 +423,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
*/
@PostMapping(value = "/addStandardsFile")
public Result<?> addStandardsFile(@RequestBody List<OSSFile> ossFileList, HttpServletRequest request) {
String publicKey = request.getParameter("publicKey");
String token = request.getParameter("token");
authenticationUtils.check(token, publicKey);
for (OSSFile ossFile : ossFileList) {
iossFileService.saveOrUpdate(ossFile);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+10 -12
View File
@@ -265,7 +265,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
if (payMeetingSituation1.getIsZero()) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
payMeetingSituation1.setRegisterProcess(12);
}else {
if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
payMeetingSituation1.setRegisterProcess(3);
}else {
payMeetingSituation1.setRegisterProcess(1);
}
}
payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
@@ -1193,17 +1202,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}
}
if (payMeetingSituation1.getIsZero()) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
payMeetingSituation1.setRegisterProcess(12);
}else {
if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
payMeetingSituation1.setRegisterProcess(3);
}else {
payMeetingSituation1.setRegisterProcess(1);
}
}
return payMeetingSituation1;
}