From b73539de9f836ec4d3679c78779a4482be441f77 Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Sat, 12 Feb 2022 17:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 16 +++- .../service/IPayCompanyManagementService.java | 6 +- .../impl/PayCompanyManagementServiceImpl.java | 81 ++++++++++++++++++- 3 files changed, 97 insertions(+), 6 deletions(-) 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 f9ba928d..6dadc742 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 @@ -901,16 +901,28 @@ public class PayCompanyManagementController extends JeroController saveOrEdit(@RequestBody PayCompanyAndContactsManagement payCompanyAndContactsManagement) { payCompanyManagementService.saveOrEdit(payCompanyAndContactsManagement); return Result.OK("同步成功!"); } + /** + * 会员系统同步数据 + * + * @param payCompanyAndContactsManagement 会员系统同步数据 + * @return + */ + @ApiOperation(value="企业管理-会员系统同步数据,编辑", notes="企业管理-会员系统同步数据,编辑") + @PostMapping(value = "/memberEdit") + public Result memberEdit(@RequestBody PayCompanyAndContactsManagement payCompanyAndContactsManagement) { + payCompanyManagementService.edit(payCompanyAndContactsManagement); + return Result.OK("同步成功!"); + } } 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 3ff33f3f..af21179b 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 @@ -105,8 +105,12 @@ public interface IPayCompanyManagementService extends IService queryPayCompanyManagement = new LambdaQueryWrapper<>(); @@ -488,6 +490,8 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl listPayContactsManagementNew = payContactsManagementService.list(queryPayContactsManagementNew); // 已经存在会员用户，变更会员用户 if(!CollectionUtils.isEmpty(listPayContactsManagementNew) - && !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){ + && !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){ LambdaUpdateWrapper updatePayContactsManagement = new LambdaUpdateWrapper<>(); updatePayContactsManagement.eq(PayContactsManagement::getId,listPayContactsManagementNew.get(0).getId()); updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1); @@ -528,6 +532,77 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl queryDutyCode = new LambdaQueryWrapper<>(); + queryDutyCode.ne(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + queryDutyCode.eq(PayCompanyManagement::getDutyCode,payCompanyManagement.getDutyCode()); + List queryDutyCodeList = payCompanyManagementService.list(queryDutyCode); + if(CollectionUtils.isNotEmpty(queryDutyCodeList)){ + throw new JeroBootException("信用代码已存在！"); + } + + payCompanyManagement.setPostalCode(null); + LambdaQueryWrapper queryPayCompanyManagement = new LambdaQueryWrapper<>(); + queryPayCompanyManagement.eq(PayCompanyManagement::getCompanyName,payCompanyManagement.getCompanyName()); + queryPayCompanyManagement.last("limit 1"); + List listPayCompanyManagement = payCompanyManagementService.list(queryPayCompanyManagement); + String phone = PasswordUtil.encrypt(payContactsManagement.getPhone()); + LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); + queryPayContactsManagement.eq(PayContactsManagement::getPhone,phone); + queryPayContactsManagement.last("limit 1"); + List listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement); + + payCompanyManagement.setFlagStatus(PayCompanyManagementCommon.FLAG_STATUS); + payContactsManagement.setFlagStatus(PayContactsManagementCommon.FLAG_STATUS); + payCompanyManagement.setRoleCode(PayCompanyManagementCommon.ROLE_CODE2); + payContactsManagement.setRoleCode(PayContactsManagementCommon.ROLE_CODE2); + + payContactsManagement.setCompanyId(listPayCompanyManagement.get(0).getId()); + // 如果存在用户 + if(!CollectionUtils.isEmpty(listPayContactsManagement)){ + // 企业不同，返回异常 + if(!Objects.equals(listPayContactsManagement.get(0).getCompanyId(),listPayCompanyManagement.get(0).getId())){ + throw new JeroBootException("此用户已在其他企业下"); + }else{ + LambdaQueryWrapper queryPayContactsManagementNew = new LambdaQueryWrapper<>(); + queryPayContactsManagementNew.eq(PayContactsManagement::getCompanyId,listPayCompanyManagement.get(0).getId()); + queryPayContactsManagementNew.eq(PayContactsManagement::getRoleCode,PayCompanyManagementCommon.ROLE_CODE2); + List listPayContactsManagementNew = payContactsManagementService.list(queryPayContactsManagementNew); + // 已经存在会员用户，变更会员用户 + if(!CollectionUtils.isEmpty(listPayContactsManagementNew) + && !Objects.equals(listPayContactsManagementNew.get(0).getPhone(),PasswordUtil.encrypt(payCompanyManagement.getCompanyPhone()))){ + LambdaUpdateWrapper updatePayContactsManagement = new LambdaUpdateWrapper<>(); + updatePayContactsManagement.eq(PayContactsManagement::getId,listPayContactsManagementNew.get(0).getId()); + updatePayContactsManagement.set(PayContactsManagement::getRoleCode,PayContactsManagementCommon.ROLE_CODE1); + payContactsManagementService.update(updatePayContactsManagement); + } + payContactsManagement.setId(listPayContactsManagement.get(0).getId()); + payContactsManagementService.contactsEditMember(payContactsManagement); + } + }else{ + payContactsManagement.setDelFlag(PayContactsManagementCommon.DEL_FLAG1); + payContactsManagementService.addMeeting(payContactsManagement); + } + payCompanyManagement.setId(listPayCompanyManagement.get(0).getId()); + companyEditMember(payCompanyManagement); + + } + /** * 校验企业名称和信用代码是否匹配 * @param payCompanyManagement