diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 3fabbb39..0265c588 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -48,10 +48,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -207,22 +204,23 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl payPaymentRecords = new ArrayList<>(); + PayPaymentRecord payPaymentRecord = new PayPaymentRecord(); + payPaymentRecord.setProjectId(meetingSituation.getId()); + payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3)); + payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable()); + payPaymentRecord.setPaymentDate(new Date()); + payPaymentRecords.add(payPaymentRecord); + //添加来款 + payPaymentRecordService.addAmountReceived(payPaymentRecords); } - //设置到账 - meetingSituation.setInAccount(PayProjectCommon.YES); - //设置实收金额 - meetingSituation.setPaidAmount(meetingSituation.getAmountReceivable()); - meetingSituation.setCheckResult(checkResult); - saveOrUpdate(meetingSituation); - List payPaymentRecords = new ArrayList<>(); - PayPaymentRecord payPaymentRecord = new PayPaymentRecord(); - payPaymentRecord.setProjectId(meetingSituation.getId()); - payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3)); - payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable()); - payPaymentRecord.setPaymentDate(new Date()); - payPaymentRecords.add(payPaymentRecord); - //添加来款 - payPaymentRecordService.addAmountReceived(payPaymentRecords); } @Override @@ -346,7 +344,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl