diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 67b240b7..9befa81c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -11,10 +11,12 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.*; +import com.jero.common.util.ImportExcelUtil; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.common.PayContactsManagementCommon; -import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -32,7 +34,6 @@ import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayCommonProjectService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; -import com.jero.standards.memberinfo.service.IMemberInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -91,8 +92,8 @@ public class PayContactsManagementController extends JeroController updatePayContactsManagement = new LambdaUpdateWrapper<>(); // 企业管理员变更需要同步会员项目 - if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){ - // 变更了企业,企业管理员不允许变更企业 - if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){ - throw new JeroBootException("企业管理员不允许变更企业"); - }else{ - // 调用会员项目接口 - MemberInfo memberInfo = new MemberInfo(); - memberInfo.setCompanyName(payCompanyManagement.getCompanyName()); - memberInfo.setId(payCompanyManagement.getMemberId()); - memberInfo.setLiaisonMan(payContactsManagement.getName()); - memberInfo.setEmail(payContactsManagement.getEmail()); - memberInfo.setMobile(payContactsManagement.getPhone()); - memberInfo.setAddress(payContactsManagement.getContactAddress()); - memberInfo.setPostcode(payContactsManagement.getPostalCode()); - AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo); - } - } + //if(Objects.equals(payContactsManagementOld.getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){ + // // 变更了企业,企业管理员不允许变更企业 + // if(!Objects.equals(payContactsManagementOld.getCompanyId(),payContactsManagement.getCompanyId())){ + // throw new JeroBootException("企业管理员不允许变更企业"); + // }else{ + // // 调用会员项目接口 + // MemberInfo memberInfo = new MemberInfo(); + // memberInfo.setCompanyName(payCompanyManagement.getCompanyName()); + // memberInfo.setId(payCompanyManagement.getMemberId()); + // memberInfo.setLiaisonMan(payContactsManagement.getName()); + // memberInfo.setEmail(payContactsManagement.getEmail()); + // memberInfo.setMobile(payContactsManagement.getPhone()); + // memberInfo.setAddress(payContactsManagement.getContactAddress()); + // memberInfo.setPostcode(payContactsManagement.getPostalCode()); + // AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo); + // } + //} try { if (!StringUtils.isBlank(payContactsManagement.getPhone())){ payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone())); @@ -419,10 +420,10 @@ public class PayContactsManagementController extends JeroController{ LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); @@ -507,10 +508,10 @@ public class PayContactsManagementController extends JeroController{ - // 企业管理员验证 - if(Objects.equals(listPayContactsManagement.get(0).getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){ - msgCode.append(p.getName() + "企业管理员不可删除!"); - } + //// 企业管理员验证 + //if(Objects.equals(listPayContactsManagement.get(0).getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){ + // msgCode.append(p.getName() + "企业管理员不可删除!"); + //} LambdaQueryWrapper queryPayCommonProject = new LambdaQueryWrapper<>(); queryPayCommonProject.eq(PayCommonProject::getContactsId,p.getId()).or().eq(PayCommonProject::getMailContactsId,p.getId()); List listPayCommonProject = payCommonProjectService.list(queryPayCommonProject); @@ -1061,15 +1062,9 @@ public class PayContactsManagementController extends JeroController baseInfo() { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //查出来人 - //LambdaQueryWrapper queryPayContactsManagement = new LambdaQueryWrapper<>(); - //queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername()); - //PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement); //查出来企业 PayCompanyManagement company = payCompanyManagementService.getById(sysUser.getCompanyId()); - Map baseInfo = memberInfoService.baseInfo(company); - - return Result.OK(baseInfo); + return Result.OK(company); } } 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 14d84c25..eeaf06fd 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 @@ -278,18 +278,18 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(PayCompanyManagement::getId,id); updateWrapper.set(PayCompanyManagement::getCompanyName,companyName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 87fd1770..00f9a645 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -167,23 +167,23 @@ public class PayContactsManagementServiceImpl extends ServiceImpl { * @param id * @param standardsTypeEnum */ - void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum); + //void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum); - void pushBillEditToStandards(PayMailBill payMailBill, Integer type); + //void pushBillEditToStandards(PayMailBill payMailBill, Integer type); /** * 接收会员系统开票邮寄信息 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index a9be5dca..3e34b66c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -448,22 +448,22 @@ public class PayMailBillServiceImpl extends ServiceImpl