From 6699c50f82b904b5ab1773966339157beb71a069 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 27 Sep 2023 16:19:43 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E5=91=98=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE,=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E6=98=AF=E5=90=A6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCompanyManagementController.java | 14 ++++++++++++++
 .../company/mapper/PayCompanyManagementMapper.java |  2 ++
 .../mapper/xml/PayCompanyManagementMapper.xml      |  8 ++++++++
 .../service/IPayCompanyManagementService.java      |  2 ++
 .../impl/PayCompanyManagementServiceImpl.java      |  8 ++++++++
 5 files changed, 34 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
index 20f27cef..8f9f0f1c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
@@ -1008,6 +1008,20 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		return Result.OK("同步成功!");
 	}
 
+	/**
+	 *  会员系统单位名称变更
+	 *
+	 * @return
+	 */
+	@ApiOperation(value="会员系统同步数据,校验公司名称是否可以修改")
+	@PostMapping(value = "/checkMemberCompanyName")
+	public Result<?> checkMemberCompanyName(@RequestBody JSONObject json) {
+		String companyName = json.getString("companyName");
+		String memberId = json.getString("memberId");
+		payCompanyManagementService.checkMemberCompanyName(memberId,companyName);
+		return Result.OK("同步成功!");
+	}
+
 	/**
 	 *  无权限直接编辑企业发票信息
 	 *
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java
index 5e7697d3..550f1faa 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java
@@ -25,4 +25,6 @@ public interface PayCompanyManagementMapper extends BaseMapper<PayCompanyManagem
     List<PayCompanyManagement> listPayCompanyManagement(List<String> companyList);
 
     void updateMemberCompanyName(@Param("memberId") String memberId, @Param("companyName") String companyName);
+
+    Integer checkMemberCompanyName(@Param("memberId") String memberId, @Param("companyName") String companyName);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml
index 7b8b85f0..cabfbc48 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml
@@ -31,4 +31,12 @@
         set company_name = #{companyName}
         where member_id = #{memberId}
     </update>
+
+    <select id="checkMemberCompanyName" resultType="java.lang.Integer">
+        select count(id) from pay_company_management
+        where company_name = #{companyName}
+        <if test="memberId != null and memberId != ''">
+            and member_id != #{memberId}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java
index fd2d2de6..5bb9f597 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java
@@ -119,4 +119,6 @@ public interface IPayCompanyManagementService extends IService<PayCompanyManagem
     PayCompanyManagement getCompanyByName(String companyName);
 
     void updateMemberCompanyName(String memberId, String companyName);
+
+    void checkMemberCompanyName(String memberId, String companyName);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
index 5c3a398b..095c1a00 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
@@ -700,6 +700,14 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
         payCompanyManagementMapper.updateMemberCompanyName(memberId,companyName);
     }
 
+    @Override
+    public void checkMemberCompanyName(String memberId, String companyName) {
+        Integer count = payCompanyManagementMapper.checkMemberCompanyName(memberId, companyName);
+        if (count > 0){
+            throw new JeroBootException("变更企业名称已被占用，请修改！");
+        }
+    }
+
     /**
      * 校验企业名称和信用代码是否匹配
      * @param payCompanyManagement