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

fix:企业端分标委

Browse Source
This commit is contained in:
zhangqinlin
2021-12-16 16:01:44 +08:00
parent 7758b07c0f
commit f7d03cc178
6 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+59 -11
View File
@@ -38,14 +38,8 @@ import com.jero.meeting.entity.PayMeeting;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.meeting.service.IPayMeetingService;
import com.jero.meeting.service.IPayMeetingSituationService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.entity.TbMemberProject;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.member.service.ITbMemberProjectService;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.member.entity.*;
import com.jero.member.service.*;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.project.entity.PayCommonProject;
@@ -112,6 +106,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Resource
private ITbMemberProjectService tbMemberProjectService;
@Resource
private ITbCertificatePaymentService tbCertificatePaymentService;
@Resource
private ISysUserService sysUserService;
@@ -226,7 +222,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
project = payWorkingGroup.getWorkingGroupProject();
principalId = payWorkingGroup.getPrincipalIdA();
} else if (GlobalConstants.THERE.equals(one.getProjectType())) {
} else if (GlobalConstants.THREE.equals(one.getProjectType())) {
PayMeetingSituation meetingPayContactsManagementOld = payMeetingSituationService.getById(one.getProjectId());
if(Objects.isNull(meetingPayContactsManagementOld)){
throw new JeroBootException("项目不存在！");
@@ -278,6 +274,27 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
//推送邮寄数据到会员系统
payMailBillService.pushBillEditToStandards(payMailBill);
}else if(GlobalConstants.SIX.equals(one.getProjectType())){
TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
if(Objects.isNull(tbCertificatePayment)){
throw new JeroBootException("标协会员证书不存在！");
}
TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbCertificatePayment.getProjectId());
if(Objects.isNull(tbMemberProject)){
throw new JeroBootException("标协会员不存在！");
}
project = tbMemberProject.getProjectName();
principalId = tbMemberProject.getDirectorId();
PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbCertificatePayment.getLiaisonManId());
if(!Objects.isNull(tbMemberPayContactsManagement)){
String str = JSON.toJSONString(tbMemberPayContactsManagement);
PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
listId.add(meetingTemporary);
}
//推送邮寄数据到会员系统
payMailBillService.pushBillEditToStandards(payMailBill);
}
// 发送给项目负责人
if (!StringUtils.isBlank(principalId)) {
@@ -331,7 +348,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
return Result.OK("操作成功!");
}
/**
* 邮寄票据-邮寄
*
@@ -443,7 +460,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
payWorkingGroupSubItem.setMail(constant.TWO);
payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
}
} else if (GlobalConstants.THERE.equals(one.getProjectType())) {
} else if (GlobalConstants.THREE.equals(one.getProjectType())) {
PayMeetingSituation meetingPayContactsManagementOld = payMeetingSituationService.getById(one.getProjectId());
if(Objects.isNull(meetingPayContactsManagementOld)){
throw new JeroBootException("项目不存在！");
@@ -530,6 +547,37 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
//推送邮寄数据到会员系统
payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
}else if(GlobalConstants.SIX.equals(one.getProjectType())){
TbCertificatePayment tbCertificatePayment = tbCertificatePaymentService.getById(one.getProjectId());
if(Objects.isNull(tbCertificatePayment)){
throw new JeroBootException("标协会员证书不存在！");
}
TbMemberProject tbMemberProject = tbMemberProjectService.getById(tbCertificatePayment.getProjectId());
if(Objects.isNull(tbMemberProject)){
throw new JeroBootException("标协会员不存在！");
}
project = tbMemberProject.getProjectName();
principalId = tbMemberProject.getDirectorId();
PayContactsManagement tbMemberPayContactsManagement = payContactsManagementService.getById(tbCertificatePayment.getLiaisonManId());
if(!Objects.isNull(tbMemberPayContactsManagement)){
String str = JSON.toJSONString(tbMemberPayContactsManagement);
PayContactsManagementTemporary meetingTemporary = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
listId.add(meetingTemporary);
}
receivableAmount = tbCertificatePayment.getAmountReceivable();
TbCertificatePayment tbCertificatePayments = new TbCertificatePayment();
if (receivableAmount.compareTo(invoice) == 0 && c == y) {
tbCertificatePayments.setId(one.getProjectId());
tbCertificatePayments.setMail(constant.ONE);
tbCertificatePaymentService.updateById(tbCertificatePayments);
} else if (y <= c && y > 0) {
tbCertificatePayments.setId(one.getProjectId());
tbCertificatePayments.setMail(constant.TWO);
tbCertificatePaymentService.updateById(tbCertificatePayments);
}
//推送邮寄数据到会员系统
payMailBillService.pushSendToStandards(payMailBill, one.getProjectId());
}
// 发送给项目负责人
if (!StringUtils.isBlank(principalId)) {