add 会员系统同步数据,校验公司名称是否可以修改

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("同步成功!");
+	}
+
 	/**
 	 *  无权限直接编辑企业发票信息
 	 *

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

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>

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

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