fix:企业端分标委

jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java

@@ -27,7 +27,7 @@ public class GlobalConstants {
     /**
      * 3
      */
-    public static final Integer THERE=3;
+    public static final Integer THREE=3;
 
     /**
      * 4
@@ -38,4 +38,8 @@ public class GlobalConstants {
      * 5
      */
     public static final Integer FIVE=5;
+    /**
+     * 6
+     */
+    public static final Integer SIX=6;
 }

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java

@@ -387,7 +387,6 @@ public class CompanyLoginController {
     @PostMapping(value = "/changePassword")
     public Result<?> changePassword(@RequestBody CompanyLoginVO companyLoginVO) {
         payContactsManagementService.changePassword(companyLoginVO);
-
         return Result.OK("修改密码成功");
     }
 

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java

@@ -155,6 +155,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
 		if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){
 			return Result.error("企业名称长度不能大于50个字符！");
 		}
+		//此处只做约束理事会添加成员
 		if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())){
 			return Result.error("理事会标识错误");
 		}

jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java

@@ -26,7 +26,6 @@ import lombok.experimental.Accessors;
 @ApiModel(value="pay_case_committee对象", description="pay_case_committee")
 public class PayCaseCommittee implements Serializable {
     private static final long serialVersionUID = 1L;
-
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")

jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java

@@ -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.*;
-import com.jero.member.entity.PayMemberProjectSubitem;
+import com.jero.member.service.*;
-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.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)) {

jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java

@@ -34,7 +34,6 @@ public class SystemRemindersController {
     private Scheduler scheduler;
 
     private static final String jobName = "com.jero.quartz.job.RemindersAllJob";
-
     /**
      *   系统催款
      *