Merge remote-tracking branch 'origin/branch20211008' into branch20211008

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分钟内只能发送一次验证码");
             }
         }

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");

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java

@@ -315,5 +315,9 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
         return Result.OK("合并开票成功!");
     }
 
-
+    @ApiOperation(value = "校验是否为会员单位")
+    @GetMapping(value = "/checkMember")
+    public Result<Boolean> checkMember(String companyName) {
+        return Result.OK(payMeetingSituationService.checkMember(companyName));
+    }
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java

@@ -28,7 +28,9 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 	 */
     void editById(PayMeetingSituationVO payMeetingSituationVO);
 
-	/**
+    Boolean checkMember(String companyName);
+
+    /**
 	 * 通过id删除
 	 */
     void deleteById(String id);

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -922,9 +922,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 //如果是标协会议判断会员类型
                 if (meetingType.equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
                     //根据企业名称和会员类型不为null判断是否为标协会员
-                    int count = memberInfoService.check(payMeetingSituation1.getCompanyName());
                     //如果是标协会员就存入会议费用（标协会员）
-                    if (count > 0) {
+                    if (checkMember(payMeetingSituation1.getCompanyName())) {
                         payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCostsVip());
                     } else {
                         payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
@@ -989,6 +988,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         return payMeetingSituation1;
     }
 
+    /**
+     * 判断是否是会员单位
+     * @param companyName 公司名称
+     * @return boolean
+     */
+    @Override
+    public Boolean checkMember(String companyName){
+        return memberInfoService.check(companyName) > 0;
+    }
+
     private void canHuiContact(PayMeetingSituation payMeetingSituation, String companyId, PayContactsManagement contactsManagement) {
         if (contactsManagement == null) {
             throw new JeroBootException("联系人不存在");

pom.xml

@@ -270,7 +270,7 @@
 	</dependencyManagement>
 
 	<build>
-		<finalName>jero-boot</finalName>
+		<finalName>income_payments</finalName>
 		<plugins>
 			<!--<plugin>
 				<groupId>org.springframework.boot</groupId>