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

Merge branch 'branch20211008' into xuqiubiangeng1026

Browse Source 
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
#	jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
This commit is contained in:
梁琦涛
2021-10-28 16:15:29 +08:00
parent 4ad3f471ec ab2a0f51be
commit e7117db802
47 changed files with 608 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectPackServiceImpl.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class ProjectPackServiceImpl implements ProjectPackService {
throw new JeroBootException("企业不匹配！");
}
//审核不通过不允许打包
if (!Objects.equals(payMeetingSituationOld.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
if (!Objects.equals(payMeetingSituationOld.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("项目未审核通过！");
}
LambdaUpdateWrapper<PayMeetingSituation> payMeetingSituation = new LambdaUpdateWrapper<>();
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+4 -2
View File
@@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService {
if(!Objects.isNull(map)) {
// 替换企业端系统url与小程序名称
// todo 替换系统地址，小程序名称
if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){
map.put("systemAddress",env.getProperty("message.systemUrl"));
map.put("wxName",env.getProperty("message.wxName"));
}