From f7d03cc1787a7b002f33e6f7388bd37fef839b64 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Thu, 16 Dec 2021 16:01:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E6=A0=87=E5=A7=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/GlobalConstants.java | 6 +- .../controller/CompanyLoginController.java | 1 - .../PayCompanyManagementController.java | 1 + .../jero/data/entity/PayCaseCommittee.java | 1 - .../controller/PayMailBillController.java | 70 ++++++++++++++++--- .../controller/SystemRemindersController.java | 1 - 6 files changed, 65 insertions(+), 15 deletions(-) diff --git a/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java b/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java index f4866253..80222135 100644 --- a/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/constant/GlobalConstants.java +++ b/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; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 1b953008..84abb1d0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/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("修改密码成功"); } 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 88837f31..239d6097 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 @@ -155,6 +155,7 @@ public class PayCompanyManagementController extends JeroController 50){ return Result.error("企业名称长度不能大于50个字符！"); } + //此处只做约束理事会添加成员 if(!StringUtils.isBlank(payCompanyManagement.getMemberNature()) && !"2".equals(payCompanyManagement.getMemberNature())){ return Result.error("理事会标识错误"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java index d3a54450..760b4e9f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java +++ b/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 = "主键") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index a0ff2ad6..1ab393dd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/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.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 0) { + tbCertificatePayments.setId(one.getProjectId()); + tbCertificatePayments.setMail(constant.TWO); + tbCertificatePaymentService.updateById(tbCertificatePayments); + } + //推送邮寄数据到会员系统 + payMailBillService.pushSendToStandards(payMailBill, one.getProjectId()); } // 发送给项目负责人 if (!StringUtils.isBlank(principalId)) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java index 398d3985..b014d897 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemRemindersController.java +++ b/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"; - /** * 系统催款 *