From 1b20d860782f771ebee2d36068f3560891ff44fe Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 26 Oct 2021 10:48:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=20bug=2041425=20=E6=A0=87=E5=8D=8F=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE,=E6=8A=A5=E5=90=8D=E6=97=B6,=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BC=9A=E5=91=98=E7=9A=84=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=AE=97=E5=87=BA=E4=BC=9A=E8=AE=AE=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternalMeetingSituationController.java         |  6 +++++-
 .../service/IPayMeetingSituationService.java        |  4 +++-
 .../impl/PayMeetingSituationServiceImpl.java        | 13 +++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

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<PayMeetin
         return Result.OK("合并开票成功!");
     }
 
-
+    @ApiOperation(value = "校验是否为会员单位")
+    @GetMapping(value = "/checkMember")
+    public Result<Boolean> 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<PayMeetingSituatio
 	 */
     void editById(PayMeetingSituationVO payMeetingSituationVO);
 
-	/**
+    Boolean checkMember(String companyName);
+
+    /**
 	 * 通过id删除
 	 */
     void deleteById(String id);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 6411454c..ed4ff19f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/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("联系人不存在");