LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete 同步到会员系统代码（部分处理）

Browse Source
This commit is contained in:
lijiarao
2024-03-15 09:40:56 +08:00
parent be33df3cf5
commit 371753ae2d
6 changed files with 160 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+32 -37
View File
@@ -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<PayContactsM
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource
private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
@Resource
private IMemberInfoService memberInfoService;
//@Resource
//private IMemberInfoService memberInfoService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
@@ -342,23 +343,23 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}
LambdaUpdateWrapper<PayContactsManagement> 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<PayContactsM
if(CollectionUtils.isEmpty(listPayContactsManagement)){
return Result.error("联系人不存在！");
}
// 企业管理员验证
if(Objects.equals(listPayContactsManagement.get(0).getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
return Result.error("企业管理员不可删除！");
}
//// 企业管理员验证
//if(Objects.equals(listPayContactsManagement.get(0).getRoleCode(),PayContactsManagementCommon.ROLE_CODE2)){
// return Result.error("企业管理员不可删除！");
//}
StringBuilder msg = new StringBuilder();
listPayContactsManagement.forEach(p->{
LambdaQueryWrapper<PayCommonProject> queryPayCommonProject = new LambdaQueryWrapper<>();
@@ -507,10 +508,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
StringBuilder msg = new StringBuilder();
StringBuilder msgCode = new StringBuilder();
listPayContactsManagement.forEach(p->{
// 企业管理员验证
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<PayCommonProject> queryPayCommonProject = new LambdaQueryWrapper<>();
queryPayCommonProject.eq(PayCommonProject::getContactsId,p.getId()).or().eq(PayCommonProject::getMailContactsId,p.getId());
List<PayCommonProject> listPayCommonProject = payCommonProjectService.list(queryPayCommonProject);
@@ -1061,15 +1062,9 @@ public class PayContactsManagementController extends JeroController<PayContactsM
@GetMapping(value = "/baseInfo")
public Result<?> baseInfo() {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//查出来人
//LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
//queryPayContactsManagement.eq(PayContactsManagement::getPhone,sysUser.getUsername());
//PayContactsManagement contacts = payContactsManagementService.getOne(queryPayContactsManagement);
//查出来企业
PayCompanyManagement company = payCompanyManagementService.getById(sysUser.getCompanyId());
Map<String,Object> baseInfo = memberInfoService.baseInfo(company);
return Result.OK(baseInfo);
return Result.OK(company);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java
+44 -44
View File
@@ -278,18 +278,18 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
//if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// // 调用会员项目接口
// MemberInfo memberInfo = new MemberInfo();
// memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
// memberInfo.setId(payCompanyManagementOld.getMemberId());
// memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
// memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
// memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
// memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
// memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
// AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
//}
// 如果该企业状态为通过，更新时间戳
if(Objects.equals(payCompanyManagementOld.getStatus(),PayCompanyManagementCommon.STATUS1)){
payCompanyManagement.setEditTime(new Date());
@@ -410,22 +410,22 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
throw new JeroBootException("会员企业名称不可修改!");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
memberInfo.setId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
memberInfo.setLinkBankNumber(payCompanyManagement.getLinkBankNumber());
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
//if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
// throw new JeroBootException("会员企业名称不可修改!");
// }
// // 调用会员项目接口
// MemberInfo memberInfo = new MemberInfo();
// memberInfo.setCompanyName(payCompanyManagement.getCompanyName());
// memberInfo.setId(payCompanyManagementOld.getMemberId());
// memberInfo.setTaxNo(payCompanyManagement.getDutyCode());
// memberInfo.setDepositBank(payCompanyManagement.getOpeningBank());
// memberInfo.setBankAccount(payCompanyManagement.getBankAccount());
// memberInfo.setInvoiceAddress(payCompanyManagement.getCompanyAddress());
// memberInfo.setInvoicePhone(payCompanyManagement.getCompanyPhone());
// memberInfo.setLinkBankNumber(payCompanyManagement.getLinkBankNumber());
// AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
//}
// 财务人员，直接批量变更状态
if(sysUser.getRoleCode().contains(RoleCommon.CWRY)){
payCompanyManagementOld.setCompanyName(payCompanyManagement.getCompanyName());
@@ -488,22 +488,22 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl<PayCompanyManag
}
}
// 会员企业编辑同步会员系统
if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
if(!Objects.equals(payCompanyManagementOld.getCompanyName(),companyName)){
throw new JeroBootException("会员企业名称不可修改!");
}
// 调用会员项目接口
MemberInfo memberInfo = new MemberInfo();
memberInfo.setCompanyName(companyName);
memberInfo.setId(payCompanyManagementOld.getMemberId());
memberInfo.setTaxNo(dutyCode);
memberInfo.setDepositBank(openingBank);
memberInfo.setBankAccount(bankAccount);
memberInfo.setInvoiceAddress(companyAddress);
memberInfo.setInvoicePhone(companyPhone);
memberInfo.setLinkBankNumber(linkBankNumber);
AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
}
//if(Objects.equals(payCompanyManagementOld.getRoleCode(),PayCompanyManagementCommon.ROLE_CODE2)){
// if(!Objects.equals(payCompanyManagementOld.getCompanyName(),companyName)){
// throw new JeroBootException("会员企业名称不可修改!");
// }
// // 调用会员项目接口
// MemberInfo memberInfo = new MemberInfo();
// memberInfo.setCompanyName(companyName);
// memberInfo.setId(payCompanyManagementOld.getMemberId());
// memberInfo.setTaxNo(dutyCode);
// memberInfo.setDepositBank(openingBank);
// memberInfo.setBankAccount(bankAccount);
// memberInfo.setInvoiceAddress(companyAddress);
// memberInfo.setInvoicePhone(companyPhone);
// memberInfo.setLinkBankNumber(linkBankNumber);
// AuthenticationUtils.post("/memberInfo/memberInfo/incomingEdit","",memberInfo);
//}
LambdaUpdateWrapper<PayCompanyManagement> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(PayCompanyManagement::getId,id);
updateWrapper.set(PayCompanyManagement::getCompanyName,companyName);
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+17 -17
View File
@@ -167,23 +167,23 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
}
// 企业管理员变更，并且变更了企业，需要同步会员项目
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())){
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+8 -8
View File
@@ -310,8 +310,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
listId.add(meetingTemporary);
}
//推送邮寄数据到会员系统
payMailBillService.pushBillEditToStandards(payMailBill,GlobalConstants.FIVE);
////推送邮寄数据到会员系统
//payMailBillService.pushBillEditToStandards(payMailBill,GlobalConstants.FIVE);
}else if(GlobalConstants.SIX.equals(one.getProjectType())){
TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
if(Objects.isNull(tbCertificatePayment)){
@@ -330,8 +330,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
listId.add(meetingTemporary);
}
//推送邮寄数据到会员系统
payMailBillService.pushBillEditToStandards(payMailBill, GlobalConstants.SIX);
////推送邮寄数据到会员系统
//payMailBillService.pushBillEditToStandards(payMailBill, GlobalConstants.SIX);
}
// 发送给项目负责人
@@ -574,8 +574,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
tbMemberProjectSubitem.setMail(constant.TWO);
tbMemberProjectSubitemService.updateById(tbMemberProjectSubitem);
}
//推送邮寄数据到会员系统
payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.STANDARDS);
////推送邮寄数据到会员系统
//payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.STANDARDS);
}else if(GlobalConstants.SIX.equals(one.getProjectType())){
TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
if(Objects.isNull(tbCertificatePayment)){
@@ -605,8 +605,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
tbCertificatePayments.setMail(constant.TWO);
tbCertificatePaymentService.updateById(tbCertificatePayments);
}
//推送邮寄数据到会员系统
payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.CERTIFICATE);
////推送邮寄数据到会员系统
//payMailBillService.pushSendToStandards(payMailBill, one.getProjectId(), StandardsTypeEnum.CERTIFICATE);
}
// 发送给项目负责人
if (!StringUtils.isBlank(principalId)) {
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+2 -2
View File
@@ -57,9 +57,9 @@ public interface IPayMailBillService extends IService<PayMailBill> {
* @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);
/**
* 接收会员系统开票邮寄信息
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+57 -57
View File
@@ -448,22 +448,22 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
* @param payMailBill
* @param id
*/
private void pushBillToStandards(PayMailBillVO payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
BillingInfo billingInfo = new BillingInfo();
if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
}else {
TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
billingInfo.setBillNumber(certificatePayment.getBillNumber());
billingInfo.setMemberId(certificatePayment.getMemberId());
}
billingInfo.setBillNo(payMailBill.getBillNo());
//调用接口
AuthenticationUtils.post("/billingInfo/billingInfo/billFromPayment",null,billingInfo);
}
//private void pushBillToStandards(PayMailBillVO payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
// BillingInfo billingInfo = new BillingInfo();
//
// if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
// TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
// billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
// billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
// }else {
// TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
// billingInfo.setBillNumber(certificatePayment.getBillNumber());
// billingInfo.setMemberId(certificatePayment.getMemberId());
// }
// billingInfo.setBillNo(payMailBill.getBillNo());
// //调用接口
// AuthenticationUtils.post("/billingInfo/billingInfo/billFromPayment",null,billingInfo);
//}
/**
* 推送邮寄数据到会员系统
@@ -471,48 +471,48 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
* @param id
* @param standardsTypeEnum
*/
@Override
public void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
BillingInfo billingInfo = new BillingInfo();
if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
}else {
TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
billingInfo.setBillNumber(certificatePayment.getBillNumber());
billingInfo.setMemberId(certificatePayment.getMemberId());
billingInfo.setMobile(certificatePayment.getMobile());
}
billingInfo.setBillNo(payMailBill.getBillNo());
billingInfo.setSendMethod(payMailBill.getSendMethod());
billingInfo.setSendDate(payMailBill.getSendDate());
billingInfo.setPostNo(payMailBill.getPostNo());
AuthenticationUtils.post("/billingInfo/billingInfo/postFromPayment",null,billingInfo);
}
//@Override
//public void pushSendToStandards(PayMailBill payMailBill, String id, StandardsTypeEnum standardsTypeEnum) {
// BillingInfo billingInfo = new BillingInfo();
// if (standardsTypeEnum.equals(StandardsTypeEnum.STANDARDS)) {
// TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(id);
// billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
// billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
// billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
// }else {
// TbCertificatePayment certificatePayment = certificatePaymentMapper.selectById(id);
// billingInfo.setBillNumber(certificatePayment.getBillNumber());
// billingInfo.setMemberId(certificatePayment.getMemberId());
// billingInfo.setMobile(certificatePayment.getMobile());
// }
// billingInfo.setBillNo(payMailBill.getBillNo());
// billingInfo.setSendMethod(payMailBill.getSendMethod());
// billingInfo.setSendDate(payMailBill.getSendDate());
// billingInfo.setPostNo(payMailBill.getPostNo());
// AuthenticationUtils.post("/billingInfo/billingInfo/postFromPayment",null,billingInfo);
//}
@Override
public void pushBillEditToStandards(PayMailBill payMailBill, Integer type) {
BillingInfo billingInfo = new BillingInfo();
if (type.equals(GlobalConstants.FIVE)){
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBill.getProjectId());
//如果能是标协会员项目就推送到会员系统
if (Objects.nonNull(tbMemberProjectSubitem)) {
billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
}
}else {
TbCertificatePayment certificatePayment = certificatePaymentService.getById(payMailBill.getProjectId());
//如果能是标协证书项目就推送到会员系统
if (Objects.nonNull(certificatePayment)) {
billingInfo.setBillNumber(certificatePayment.getBillNumber());
}
}
billingInfo.setSendMethod(payMailBill.getSendMethod());
billingInfo.setPostNo(payMailBill.getPostNo());
billingInfo.setSendDate(payMailBill.getSendDate());
AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
}
//@Override
//public void pushBillEditToStandards(PayMailBill payMailBill, Integer type) {
// BillingInfo billingInfo = new BillingInfo();
// if (type.equals(GlobalConstants.FIVE)){
// TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBill.getProjectId());
// //如果能是标协会员项目就推送到会员系统
// if (Objects.nonNull(tbMemberProjectSubitem)) {
// billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
// }
// }else {
// TbCertificatePayment certificatePayment = certificatePaymentService.getById(payMailBill.getProjectId());
// //如果能是标协证书项目就推送到会员系统
// if (Objects.nonNull(certificatePayment)) {
// billingInfo.setBillNumber(certificatePayment.getBillNumber());
// }
// }
// billingInfo.setSendMethod(payMailBill.getSendMethod());
// billingInfo.setPostNo(payMailBill.getPostNo());
// billingInfo.setSendDate(payMailBill.getSendDate());
// AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
//}
@Override
public void addFromStandards(PayMailBill payMailBill) {