diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 695ecf0d36..22eb8f38ac 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -88,7 +88,8 @@ public enum EpmetErrorCode { PUBLIC_NOT_EXISTS(8651,"手机号未注册,请先完成信息注册"), SELECT_CUSTOMER_ERROR(8652,"未查询到注册客户信息"), SELECT_AGENCY_ERROR(8653,"根据客户信息未查询到注册客户组织信息"), - SELECT_USER_ERROR(8654,"根据客户信息未查询到注册客户管理员信息"); + SELECT_USER_ERROR(8654,"根据客户信息未查询到注册客户管理员信息"), + UPDATE_CUSTOMER_ERROR(8655,"更新注册客户信息为已完成初始化失败"); private int code; diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java index d4741d902b..996a70e9b2 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java @@ -60,4 +60,12 @@ public interface EpmetThirdFeignClient { @PostMapping(value = "third/pacustomer/getcustomeragencyuser/{customerId}") Result getCustomerAgencyUser(@PathVariable("customerId") String customerId); + /** + * @param customerId + * @return + * @Author sun + * @Description 修改客户数据状态为已完成初始化 + **/ + @PostMapping(value = "third/pacustomer/updatecustomer/{customerId}") + Result updateCustomer(@PathVariable("customerId") String customerId); } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java index c910fbe7bf..a1b0cd0ace 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java @@ -37,4 +37,9 @@ public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient { public Result getCustomerAgencyUser(String customerId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerAgencyUser", customerId); } + + @Override + public Result updateCustomer(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "updateCustomer", customerId); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index d0dfa447ce..16084e2d99 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -110,4 +110,16 @@ public class PaCustomerController { return new Result().ok(paCustomerService.getCustomerAgencyUser(customerId)); } + /** + * @param customerId + * @return + * @Author sun + * @Description 修改客户数据状态为已完成初始化 + **/ + @PostMapping(value = "updatecustomer/{customerId}") + public Result updateCustomer(@PathVariable("customerId") String customerId) { + paCustomerService.updateCustomer(customerId); + return new Result(); + } + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java index de4111e6c6..d0b00c2357 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java @@ -50,4 +50,12 @@ public interface PaCustomerDao extends BaseDao { * @Description 查询公众号注册的客户信息列表 **/ List registerInfo(); + + /** + * @param dto + * @return + * @Author sun + * @Description 修改客户数据状态为已完成初始化 + **/ + int updateCustomerById(PaCustomerDTO dto); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java index 5858f3b6b3..8e45d47fa3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java @@ -148,4 +148,11 @@ public interface PaCustomerService extends BaseService { **/ InitCustomerResultDTO getCustomerAgencyUser(String customerId); + /** + * @param customerId + * @return + * @Author sun + * @Description 修改客户数据状态为已完成初始化 + **/ + void updateCustomer(String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index c494a70a93..acfe7a2d8f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -413,4 +413,23 @@ public class PaCustomerServiceImpl extends BaseServiceImpl + + UPDATE pa_customer + SET is_initialize = #{isInitialize} + WHERE + del_flag = '0' + AND id = #{id} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index f1b44835ec..4b37250b73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -309,6 +309,7 @@ public class AgencyServiceImpl implements AgencyService { * @Date 2020/7/16 17:13 **/ @Override + @Transactional(rollbackFor = Exception.class) public void saveRootAgency(AddAgencyAndStaffFormDTO agencyAndStaff) { CustomerAgencyDTO agencyDTO = agencyAndStaff.getAgencyDTO(); AdminStaffFromDTO staffDTO = agencyAndStaff.getStaffDTO(); 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 fcbaf79ab8..71eca76603 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 @@ -472,6 +472,12 @@ public class CustomerServiceImpl extends BaseServiceImpl