|
|
|
@@ -918,7 +918,8 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
|
|
|
|
public void invalidReceive(WxFinanceReceive record, MallUserInfo user,boolean isRedSetoff) { |
|
|
|
//如果自身是预充单,则被冲抵了就不能作废 |
|
|
|
if (record.getType().intValue() == EnumFinanceReceiveType.ADVANCE.getCode().intValue()) { |
|
|
|
if (record.getType().intValue() == EnumFinanceCashierType.RECEIVE.getCode().intValue() && |
|
|
|
record.getReceiveType().intValue() == EnumFinanceReceiveType.ADVANCE.getCode().intValue()) { |
|
|
|
WxFinanceReceiveSetoff rsq0 = new WxFinanceReceiveSetoff(); |
|
|
|
rsq0.updateTenantInfo(record); |
|
|
|
rsq0.setAdvanceId(record.getId()); |
|
|
|
@@ -964,13 +965,23 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
|
payDto.updateTenantInfo(record); |
|
|
|
payDto.setId(bill.getId()); |
|
|
|
payDto.setBillTypeValue(bill.getBillType()); |
|
|
|
payDto.setAddpay(rb.getReceive()); |
|
|
|
if (isRedSetoff) { |
|
|
|
payDto.setRemark("收款单红冲,自动回退"); |
|
|
|
if (record.getType().intValue() == EnumFinanceCashierType.RECEIVE.getCode().intValue()) { |
|
|
|
payDto.setAddpay(rb.getReceive()); |
|
|
|
if (isRedSetoff) { |
|
|
|
payDto.setRemark("收款单红冲,自动回退"); |
|
|
|
}else { |
|
|
|
payDto.setRemark("收款单作废,自动回退"); |
|
|
|
} |
|
|
|
wxBillAllHelper.backPay(payDto, user); |
|
|
|
}else { |
|
|
|
payDto.setRemark("收款单作废,自动回退"); |
|
|
|
payDto.setPayToMerchant(rb.getPay()); |
|
|
|
if (isRedSetoff) { |
|
|
|
payDto.setRemark("付款单红冲,自动回退"); |
|
|
|
}else { |
|
|
|
payDto.setRemark("付款单作废,自动回退"); |
|
|
|
} |
|
|
|
wxBillAllHelper.toMechantBackPay(payDto, user); |
|
|
|
} |
|
|
|
wxBillAllHelper.backPay(payDto, user); |
|
|
|
|
|
|
|
}else { |
|
|
|
//预收单冲抵回退 |
|
|
|
|