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:
baozhipeng
2021-12-20 21:42:57 +08:00
parent d4b09c098b
commit 4f18dba10c
3 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java
+4 -1
View File
@@ -8,6 +8,7 @@ import com.jero.payment.vo.TbCheckVo;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.vo.PayCommonProjectOutput;
import com.jero.standards.memberinfo.entity.MemberInfo;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -84,7 +85,9 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
void type5AddCheck(PayPaymentRecord payPaymentRecord);
void type6AddCheck(PayPaymentRecord payPaymentRecord);
//发送消息
void sendMessage(String principalId,String project,PayPaymentRecord payPaymentRecord,
List<PayContactsManagementTemporary> listId);
/**
* 编辑来款
* @param payPaymentRecord
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+48 -6
View File
@@ -244,6 +244,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordMapper.insert(payPaymentRecord);
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
payPaymentRecord.setCreateBy(sysUser.getUsername());
payPaymentRecord.setCreateTime(new Date());
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentRecordSub.setId(null);
payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
@@ -273,6 +275,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
throw new JeroBootException("只有拒绝的才可编辑");
}
String principalId="";
String project="";
switch (String.valueOf(payPaymentRecord.getProjectType())){
// 普通项目
case PayIncomeContractCommon.PROJECT_TYPE1:
@@ -284,6 +288,9 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payCommonProject.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payCommonProjectMapper.updateById(payCommonProject);
//发消息参数
principalId = payCommonProject.getPrincipalId();
project=payCommonProject.getChargeProject();
break;
// 工作组项目
case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -291,11 +298,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
PayWorkingGroupSubItem payWorking = new PayWorkingGroupSubItem();
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
payWorking.setId(payPaymentRecord.getProjectId());
payWorking.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payWorkingGroupSubItemMapper.updateById(payWorking);
//发消息参数
principalId = payWorkingGroup.getPrincipalIdA();
project = payWorkingGroup.getWorkingGroupProject();
break;
//会员项目
case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -303,10 +314,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
PayMemberProjectSubitem member = new PayMemberProjectSubitem();
PayMemberProject payMemberProject = memberProjectService.getById(member.getProjectId());
member.setId(payPaymentRecord.getProjectId());
member.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
payMemberProjectSubitemMapper.updateById(member);
//发消息参数
principalId = payMemberProject.getDirectorId();
project = payMemberProject.getProjectName();
break;
default:break;
}
@@ -319,10 +335,16 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
//新增子表
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
payPaymentRecord.setCreateBy(sysUser.getUsername());
payPaymentRecord.setCreateTime(new Date());
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentRecordSub.setId(null);
payPaymentRecordSub.setRecordId(payPaymentRecord.getId());
payPaymentCheckMapper.insert(payPaymentRecordSub);
//发消息
uploadSendMessage(principalId,payPaymentRecord.getProjectId(), project,String.valueOf(payPaymentRecord.getProjectType()));
}
/**
@@ -425,16 +447,25 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
//更新来款记录主表
payPaymentRecordMapper.updateById(payPaymentRecord);
//更新来款记录表子表
PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
// PayPaymentRecordSub payPaymentRecordSub = new PayPaymentRecordSub();
// BeanUtils.copyProperties(payPaymentRecord, payPaymentRecordSub);
payPaymentRecordSub.setId(null);
LambdaUpdateWrapper<PayPaymentRecordSub> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(PayPaymentRecordSub::getRecordId,payPaymentRecord.getId());
wrapper.eq(PayPaymentRecordSub::getProjectId,payPaymentRecord.getProjectId());
wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime);
wrapper.last("limit 1");
payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
// payPaymentCheckMapper.update(payPaymentRecordSub,wrapper);
PayPaymentRecordSub sub = payPaymentCheckMapper.selectList(wrapper).get(0);
sub.setRemark(payPaymentRecord.getRemark());
sub.setPaymentStatus(payPaymentRecord.getPaymentStatus());
sub.setReviewerId(payPaymentRecord.getReviewerId());
sub.setReviewerName(payPaymentRecord.getReviewerName());
sub.setReviewTime(payPaymentRecord.getReviewTime());
sub.setReviewInstructions(payPaymentRecord.getReviewInstructions());
payPaymentCheckMapper.updateById(sub);
}
BigDecimal newPaidAmount;
@@ -442,6 +473,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
String paymentStatus;
String principalId="";
String project="";
List<PayContactsManagementTemporary> listId = new ArrayList<>();
switch (String.valueOf(payPaymentRecord.getProjectType())){
@@ -577,6 +609,13 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
payPaymentRecordMapper.insert(payPaymentRecord);
tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
PayContactsManagement tbMemberPayContactsManagementCer = payContactsManagementService.getById(tbMemberCertificate.getLiaisonManId());
if(!Objects.isNull(tbMemberPayContactsManagementCer)){
String str = JSON.toJSONString(tbMemberPayContactsManagementCer);
PayContactsManagementTemporary meetingTemporaryCer = JSONObject.parseObject(str,PayContactsManagementTemporary.class);
listId.add(meetingTemporaryCer);
}
}else{
paymentStatus = getPaymentStatus(tbMemberCertificate.getAmountReceivable(), tbMemberCertificate.getPaidAmount(), PaymentStatusEnum.REJECTED.getCode());//缴费状态
//发消息参数
@@ -600,7 +639,10 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
break;
default:break;
}
//发消息
//通过消息
payPaymentRecordService.sendMessage( principalId,project, payPaymentRecord,listId);
//拒绝消息
checkSendMessage(payPaymentRecord.getCreateBy(), principalId,project, String.valueOf(payPaymentRecord.getProjectType()));
}
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+3 -2
View File
@@ -465,7 +465,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
payPaymentRecord.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
payPaymentRecordMapper.insert(payPaymentRecord);
// 发消息
SendMessage( principalId, project, payPaymentRecord, listId);
sendMessage( principalId, project, payPaymentRecord, listId);
}
/**
@@ -733,7 +733,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
}
//发送消息
private void SendMessage(String principalId,String project,PayPaymentRecord payPaymentRecord,
@Override
public void sendMessage(String principalId,String project,PayPaymentRecord payPaymentRecord,
List<PayContactsManagementTemporary> listId){
// 发送给项目负责人
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();