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

消息变更

Browse Source
This commit is contained in:
梁琦涛
2021-11-01 18:33:09 +08:00
parent 3eaa21bd7a
commit afe75bd075
10 changed files with 480 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java
+4 -3
View File
@@ -24,9 +24,10 @@ public enum CompanyMessageEnums {
MSG10("QY_10_YJTZ_MAIL_CONTRACT","邮寄通知","contractName"),//查看该物流信息，contractName
MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情
MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName"),//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
MSG13("QY_13_JFTZ_DZ_CREATE","缴费通知","projectName,amount"),//弹窗：查看该项目详情，projectName,amount
MSG14("QY_14_KPTZ_KP_CREATE","开票通知","projectName"),//弹窗：查看该项目详情，projectName
MSG15("QY_15_HYTZ_NOT_AUDIT_CREATE","会议通知","");//弹窗：查看该会议详情
MSG13("QY_13_HYTZ_FBW_CREATE","会议通知","meetingName,busId"),//点击跳转到报名页面，meetingName,busId
MSG14("QY_14_JFTZ_DZ_CREATE","缴费通知","projectName,amount"),//弹窗：查看该项目详情，projectName,amount
MSG15("QY_15_KPTZ_KP_CREATE","开票通知","projectName"),//弹窗：查看该项目详情，projectName
MSG16("QY_16_HYTZ_NOT_AUDIT_CREATE","会议通知","");//弹窗：查看该会议详情
jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java
+9 -8
View File
@@ -21,11 +21,11 @@ public enum MessageUrlEnums {
M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"),
M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"),
M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"),
M_OPEN_TYPE10("M_OPEN_TYPE10","url","/businessManagement/BusinessManagement"),// todo 未改
M_OPEN_TYPE11("M_OPEN_TYPE11","url","/businessManagement/BusinessManagement"),// todo 未改
M_OPEN_TYPE12("M_OPEN_TYPE12","url","/businessManagement/BusinessManagement"),// todo 未改
M_OPEN_TYPE13("M_OPEN_TYPE13","url","/businessManagement/BusinessManagement"),// todo 未改
M_OPEN_TYPE14("M_OPEN_TYPE14","url","/businessManagement/BusinessManagement"),// todo 未改
M_OPEN_TYPE10("M_OPEN_TYPE10","url","/incomePayments/meetManage/AttendanceInternalMeeting"),
M_OPEN_TYPE11("M_OPEN_TYPE11","component","@comp/ProjectDetailModal"),
M_OPEN_TYPE12("M_OPEN_TYPE12","component","@comp/ProjectDetailModal"),
M_OPEN_TYPE13("M_OPEN_TYPE13","component","@comp/ProjectDetailModal"),
M_OPEN_TYPE14("M_OPEN_TYPE14","url","/contractManagement/RevenueContractDetail"),
// todo 待定企业端
C_OPEN_TYPE1("C_OPEN_TYPE1","href",""),
C_OPEN_TYPE2("C_OPEN_TYPE2","component","MessagePage/MeetingDetailModal"),
@@ -39,9 +39,10 @@ public enum MessageUrlEnums {
C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE13("C_OPEN_TYPE13","href",""),// todo 未改
C_OPEN_TYPE14("C_OPEN_TYPE14","href",""),// todo 未改
C_OPEN_TYPE15("C_OPEN_TYPE15","href","");// todo 未改
C_OPEN_TYPE13("C_OPEN_TYPE13","href",""),
C_OPEN_TYPE14("C_OPEN_TYPE14","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE15("C_OPEN_TYPE15","component","MessagePage/ProjectDetailModal"),
C_OPEN_TYPE16("C_OPEN_TYPE16","component","MessagePage/ProjectDetailModal");
/**
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+56
View File
@@ -32,7 +32,9 @@ import com.jero.payment.service.IPayPaymentRecordService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -76,6 +78,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
@Resource
private ISysUserService sysUserService;
@Resource
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
@Override
public ProjectDetailVO getProjectDetail(String projectId) {
@@ -226,6 +230,58 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
}
projectDetailVO.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode());
projectDetailVO.setContactAddress(payContactsManagementTemporary.getContactAddress());
// 工作组 添加企业联系人2，联系人3
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){
PayWorkingGroupSubItem payWorkingGroupSubItem = payWorkingGroupSubItemService.getById(projectId);
if(Objects.isNull(payWorkingGroupSubItem)){
throw new JeroBootException("项目不存在！");
}
projectDetailVO.setRemarksOne(payWorkingGroupSubItem.getRemarksOne());
if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdTwo())){
projectDetailVO.setRemarksTwo(payWorkingGroupSubItem.getRemarksTwo());
PayContactsManagementTemporary payContactsManagementTemporary2 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdTwo());
if(Objects.isNull(payContactsManagementTemporary2)){
throw new JeroBootException("联系人2不存在！");
}
projectDetailVO.setNameTwo(payContactsManagementTemporary2.getName());
projectDetailVO.setGenderTwo(payContactsManagementTemporary2.getGender());
if(!Objects.isNull(payContactsManagementTemporary2.getGender())){
projectDetailVO.setGenderTwo_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary.getGender())));
}
projectDetailVO.setPostTwo(payContactsManagementTemporary2.getPost());
if(!StringUtils.isBlank(payContactsManagementTemporary2.getPhone())){
projectDetailVO.setPhoneTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getPhone()));
}
if(!StringUtils.isBlank(payContactsManagementTemporary2.getEmail())){
projectDetailVO.setEmailTwo(PasswordUtil.decrypt(payContactsManagementTemporary2.getEmail()));
}
projectDetailVO.setPostalCodeContactsTwo(payContactsManagementTemporary2.getPostalCode());
projectDetailVO.setContactAddressTwo(payContactsManagementTemporary2.getContactAddress());
}
if(!StringUtils.isEmpty(payWorkingGroupSubItem.getContactsIdThree())){
projectDetailVO.setRemarksThree(payWorkingGroupSubItem.getRemarksThree());
PayContactsManagementTemporary payContactsManagementTemporary3 = payContactsManagementTemporaryService.getById(payWorkingGroupSubItem.getContactsTemporaryIdThree());
if(Objects.isNull(payContactsManagementTemporary3)){
throw new JeroBootException("联系人3不存在！");
}
projectDetailVO.setNameThree(payContactsManagementTemporary3.getName());
projectDetailVO.setGenderThree(payContactsManagementTemporary3.getGender());
if(!Objects.isNull(payContactsManagementTemporary3.getGender())){
projectDetailVO.setGenderThree_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagementTemporary3.getGender())));
}
projectDetailVO.setPostThree(payContactsManagementTemporary3.getPost());
if(!StringUtils.isBlank(payContactsManagementTemporary3.getPhone())){
projectDetailVO.setPhoneThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getPhone()));
}
if(!StringUtils.isBlank(payContactsManagementTemporary3.getEmail())){
projectDetailVO.setEmailThree(PasswordUtil.decrypt(payContactsManagementTemporary3.getEmail()));
}
projectDetailVO.setPostalCodeContactsThree(payContactsManagementTemporary3.getPostalCode());
projectDetailVO.setContactAddressThree(payContactsManagementTemporary3.getContactAddress());
}
}
}
// 到账信息
LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+14 -8
View File
@@ -401,23 +401,29 @@ public class SendMessageServiceImpl implements SendMessageService {
signature = "中汽中心标准所";
templateId = "e1a089109aaa4820927d488613171b54";
break;
case "QY_13_JFTZ_DZ_CREATE":
case "QY_13_HYTZ_FBW_CREATE":
//中汽中心标准所-企业端-缴费通知-13
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "8beb893a9ce64444a71019c9eec6e310";
templateId = "926e49e09008438b88d80849fe9f5bbb";
break;
case "QY_14_KPTZ_KP_CREATE":
//中汽中心标准所-企业端-开票通知-14
case "QY_14_JFTZ_DZ_CREATE":
//中汽中心标准所-企业端-缴费通知-14
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "9895707d70584324b3ff398b362a83e6";
templateId = "";// todo id
break;
case "QY_15_HYTZ_NOT_AUDIT_CREATE":
//中汽中心标准所-企业端-会议通知-15
case "QY_15_KPTZ_KP_CREATE":
//中汽中心标准所-企业端-开票通知-15
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "5f438a655ed148c69f9d17e881112017";
templateId = "";// todo id
break;
case "QY_16_HYTZ_NOT_AUDIT_CREATE":
//中汽中心标准所-企业端-会议通知-16
sender = "8821092414406";
signature = "中汽中心标准所";
templateId = "";// todo id
break;
default:
throw new JeroBootException("codeType flase.");
jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+100
View File
@@ -5,6 +5,7 @@ import com.jero.mail.entity.PayMailBill;
import com.jero.payment.entity.PayPaymentRecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.Size;
import java.io.Serializable;
@@ -89,6 +90,8 @@ public class ProjectDetailVO implements Serializable {
*/
@ApiModelProperty(value = "企业地址")
private String companyAddress;
/**
* 企业联系人
*/
@@ -129,6 +132,103 @@ public class ProjectDetailVO implements Serializable {
*/
@ApiModelProperty(value = "企业联系人地址")
private String contactAddress;
/**联系人1备注*/
@ApiModelProperty(value = "联系人1备注")
private String remarksOne;
/**
* 企业联系人2
*/
@ApiModelProperty(value = "企业联系人2")
private String nameTwo;
/**
* 企业联系人性别2
*/
@ApiModelProperty(value = "企业联系人性别2")
private String genderTwo;
/**
* 企业联系人性别2
*/
@ApiModelProperty(value = "企业联系人性别2")
private String genderTwo_dictText;
/**
* 企业联系人职务2
*/
@ApiModelProperty(value = "企业联系人职务2")
private String postTwo;
/**
* 企业联系人电话2
*/
@ApiModelProperty(value = "企业联系人电话2")
private String phoneTwo;
/**
* 企业联系人邮箱2
*/
@ApiModelProperty(value = "企业联系人邮箱2")
private String emailTwo;
/**
* 企业联系人邮编2
*/
@ApiModelProperty(value = "企业联系人邮编2")
private String postalCodeContactsTwo;
/**
* 企业联系人地址2
*/
@ApiModelProperty(value = "企业联系人地址2")
private String contactAddressTwo;
/**联系人2备注*/
@ApiModelProperty(value = "联系人2备注")
private String remarksTwo;
/**
* 企业联系人3
*/
@ApiModelProperty(value = "企业联系人3")
private String nameThree;
/**
* 企业联系人性别3
*/
@ApiModelProperty(value = "企业联系人性别3")
private String genderThree;
/**
* 企业联系人性别3
*/
@ApiModelProperty(value = "企业联系人性别3")
private String genderThree_dictText;
/**
* 企业联系人职务3
*/
@ApiModelProperty(value = "企业联系人职务3")
private String postThree;
/**
* 企业联系人电话3
*/
@ApiModelProperty(value = "企业联系人电话3")
private String phoneThree;
/**
* 企业联系人邮箱3
*/
@ApiModelProperty(value = "企业联系人邮箱3")
private String emailThree;
/**
* 企业联系人邮编3
*/
@ApiModelProperty(value = "企业联系人邮编3")
private String postalCodeContactsThree;
/**
* 企业联系人地址3
*/
@ApiModelProperty(value = "企业联系人地址3")
private String contactAddressThree;
/**联系人3备注*/
@ApiModelProperty(value = "联系人3备注")
private String remarksThree;
/** 资料id，多个资料文件，逗号分隔 **/
@ApiModelProperty(value = "资料id，多个资料文件，逗号分隔")
private String files;