|
|
@@ -2792,7 +2792,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// 处理结算数据
|
|
|
// 未完全结算完成
|
|
|
InsPlyIncomeInvoiceSettlement settlement = new InsPlyIncomeInvoiceSettlement(settlementVo.getInvoicingId(), settlementVo.getActualReceivedAmount(),
|
|
|
- DateTime.now(), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
|
|
|
+ DateUtil.parse(settlementVo.getReceivePaymentDate(), "yyyy-MM-dd HH:mm:ss"), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
|
|
|
insPlyIncomeInvoiceSettlementMapper.insert(settlement);
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(settlementVo.getAttachmentIds())) {
|
|
|
@@ -4554,7 +4554,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// 处理结算数据
|
|
|
// 未完全结算完成
|
|
|
InsPlyIncomeInvoiceSettlement settlement = new InsPlyIncomeInvoiceSettlement(settlementVo.getInvoicingId(), settlementVo.getActualReceivedAmount(),
|
|
|
- DateTime.now(), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
|
|
|
+ DateUtil.parse(settlementVo.getReceivePaymentDate(), "yyyy-MM-dd HH:mm:ss"), settlementVo.getSettlementPaymentDifference(), settlementVo.getSettlementPaymentReason());
|
|
|
insPlyIncomeInvoiceSettlementMapper.insert(settlement);
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(settlementVo.getAttachmentIds())) {
|
|
|
@@ -6301,6 +6301,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
BigDecimal subtract = BigDecimalUtil.subtract(settlementAmount, insPlyIncomeInvoice.getReceivableSupervisePremium());
|
|
|
if (CollUtil.isNotEmpty(insPlyIncomeInvoiceSettlements)){
|
|
|
if(subtract.compareTo(BigDecimal.ZERO) != 0){
|
|
|
+ // 点标识结清的时候不更新收款日期,和wwq确认过
|
|
|
InsPlyIncomeInvoiceSettlement insPlyIncomeInvoiceSettlement = insPlyIncomeInvoiceSettlements.get(0);
|
|
|
insPlyIncomeInvoiceSettlement.setSettlementPaymentDifference(subtract);
|
|
|
insPlyIncomeInvoiceSettlement.setSettlementPaymentReason(settlementPaymentReason);
|