From 3813131af1f461287dfc7f51b96c631462ce0579 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 3 Aug 2020 15:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=B7=BB=E5=8A=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98Feign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/OperCrmOpenFeignClient.java | 12 ++++++++++++ .../fallback/OperCrmOpenFeignClientFallback.java | 6 ++++++ .../com/epmet/service/impl/CustomerServiceImpl.java | 13 +++++++++++++ 3 files changed, 31 insertions(+) diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java index 59a01476e7..6048121b9d 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java @@ -5,9 +5,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerAppDTO; import com.epmet.dto.CustomerDTO; import com.epmet.dto.form.CustomerAppSecretFormDTO; +import com.epmet.dto.form.CustomerManagerFormDTO; import com.epmet.feign.fallback.OperCrmOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -41,4 +43,14 @@ public interface OperCrmOpenFeignClient { */ @PostMapping("/oper/crm/customerapp/getconfigallapp") Result> getConfigAllApp(); + + /** + * 添加根管理员 + * @author zhaoqifeng + * @date 2020/8/3 15:24 + * @param form + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("/oper/crm/customer/addmanager") + Result addManager(@RequestBody CustomerManagerFormDTO form); } diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java index 81b74a4f7c..504d2be412 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerAppDTO; import com.epmet.dto.CustomerDTO; import com.epmet.dto.form.CustomerAppSecretFormDTO; +import com.epmet.dto.form.CustomerManagerFormDTO; import com.epmet.feign.OperCrmOpenFeignClient; import org.springframework.stereotype.Component; @@ -39,4 +40,9 @@ public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient { public Result> getConfigAllApp() { return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "getConfigAllApp", null); } + + @Override + public Result addManager(CustomerManagerFormDTO form) { + return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "CustomerManagerFormDTO", form); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 74e4dd8653..560586a971 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -278,6 +278,19 @@ public class CustomerServiceImpl extends BaseServiceImpl> managersResult = epmetUserFeignClient.getStaffsInRole(staffRoleFormDTO); + if(!managersResult.success()) { + log.error("查询客户根级组织的管理员失败".concat(getRoleResult.toString())); + throw new RenException("查询客户根级组织的管理员失败".concat(getRoleResult.toString())); + } + if(null != managersResult.getData() && managersResult.getData().size() > NumConstant.ZERO) { + log.error("客户已存在管理员".concat(getRoleResult.toString())); + throw new RenException("客户已存在管理员".concat(getRoleResult.toString())); + } + StaffSubmitFromDTO staffSubmitFrom = new StaffSubmitFromDTO(); staffSubmitFrom.setCustomerId(form.getCustomerId()); staffSubmitFrom.setAgencyId(customerRootAgencyResult.getData().getId());