diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java index 2c11c1a0..7d767ab7 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/HuaWeiSmsUtil.java @@ -86,7 +86,7 @@ public class HuaWeiSmsUtil { long expire = redisUtil.getExpire("_verification:_phone:" + phone); //值为-2代表没有此数据 if (expire != -2){ - if (600 - expire <= 60){ + if (Integer.parseInt(codeTime) - expire <= 60){ throw new JeroBootException("1分钟内只能发送一次验证码"); } } diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 1fd21630..b3792165 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -121,6 +121,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/company/payContactsManagement/queryByName","anon");//联系人校验 filterChainDefinitionMap.put("/sys/common/download/**","anon");//下载接口 filterChainDefinitionMap.put("/sys/oss/file/queryById","anon");//通过id查询文件 + filterChainDefinitionMap.put("/meeting/internalMeetingSituation/checkMember","anon");//校验是否为会员单位 filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 2ed3ea75..8513275f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -315,5 +315,9 @@ public class InternalMeetingSituationController extends JeroController checkMember(String companyName) { + return Result.OK(payMeetingSituationService.checkMember(companyName)); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index 9a19adf1..423fadb8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -28,7 +28,9 @@ public interface IPayMeetingSituationService extends IService 0) { + if (checkMember(payMeetingSituation1.getCompanyName())) { payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip()); } else { payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts()); @@ -989,6 +988,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 0; + } + private void canHuiContact(PayMeetingSituation payMeetingSituation, String companyId, PayContactsManagement contactsManagement) { if (contactsManagement == null) { throw new JeroBootException("联系人不存在"); diff --git a/pom.xml b/pom.xml index 314c4f6c..9cc21e7f 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ - jero-boot + income_payments