diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index 59862a10..c6fef43b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -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 { void type5AddCheck(PayPaymentRecord payPaymentRecord); void type6AddCheck(PayPaymentRecord payPaymentRecord); - + //发送消息 + void sendMessage(String principalId,String project,PayPaymentRecord payPaymentRecord, + List listId); /** * 编辑来款 * @param payPaymentRecord diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 2a3ff238..e1f43475 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -244,6 +244,8 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl 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 listId = new ArrayList<>(); switch (String.valueOf(payPaymentRecord.getProjectType())){ @@ -577,6 +609,13 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl listId){ // 发送给项目负责人 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();