|
@ -491,14 +491,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
//认款日期默认为当天的日期
|
|
|
//认款日期默认为当天的日期
|
|
|
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); |
|
|
if(v.getSubscribedOf() == 0){ |
|
|
if (v.getSubscribedOf() == 0) { |
|
|
//应收未收减去相应的认款
|
|
|
//应收未收减去相应的认款
|
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
|
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); |
|
|
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney()); |
|
|
finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney()); |
|
@ -535,7 +535,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); |
|
|
finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid()); |
|
|
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); |
|
|
if(v.getSubscribedOf() == 0){ |
|
|
if (v.getSubscribedOf() == 0) { |
|
|
//应收未收减去相应的认款
|
|
|
//应收未收减去相应的认款
|
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
@ -1005,7 +1005,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid()); |
|
|
finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid()); |
|
|
finSelectedReceivablesDetailed.setSubscribedOf(paymentDetail.getSubscribedOf()); |
|
|
finSelectedReceivablesDetailed.setSubscribedOf(paymentDetail.getSubscribedOf()); |
|
|
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); |
|
|
if(paymentDetail.getSubscribedOf() == 0){ |
|
|
if (paymentDetail.getSubscribedOf() == 0) { |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
@ -1140,8 +1140,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
//分页
|
|
|
//分页
|
|
|
IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>(); |
|
|
IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>(); |
|
|
page1.setTotal(collList.size()); |
|
|
page1.setTotal(collList.size()); |
|
|
page1.setPages(collList.size()/pagerQuery.getSize()+(collList.size()%pagerQuery.getSize()==0?0:1)); |
|
|
page1.setPages(collList.size() / pagerQuery.getSize() + (collList.size() % pagerQuery.getSize() == 0 ? 0 : 1)); |
|
|
collList = collList.stream().skip((pagerQuery.getCurrent() - 1) *pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
|
|
|
collList = collList.stream().skip((pagerQuery.getCurrent() - 1) * pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
|
|
|
page1.setRecords(collList); |
|
|
page1.setRecords(collList); |
|
|
page1.setCurrent(pagerQuery.getCurrent()); |
|
|
page1.setCurrent(pagerQuery.getCurrent()); |
|
|
page1.setSize(pagerQuery.getSize()); |
|
|
page1.setSize(pagerQuery.getSize()); |
|
@ -1183,7 +1183,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today()); |
|
|
finSelectedReceivablesDetailed.setAuditState(2); |
|
|
finSelectedReceivablesDetailed.setAuditState(2); |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
if(v.getSubscribedOf() == 0){ |
|
|
if (v.getSubscribedOf() == 0) { |
|
|
//应收未收将款项加回来
|
|
|
//应收未收将款项加回来
|
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
@ -1230,6 +1230,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
if (confirmation == null) { |
|
|
if (confirmation == null) { |
|
|
return rb.setMsg("该申请不存在"); |
|
|
return rb.setMsg("该申请不存在"); |
|
|
} |
|
|
} |
|
|
|
|
|
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid); |
|
|
//推送收款单
|
|
|
//推送收款单
|
|
|
ARReceivebill arReceivebill = new ARReceivebill(); |
|
|
ARReceivebill arReceivebill = new ARReceivebill(); |
|
|
//业务日期
|
|
|
//业务日期
|
|
@ -1430,7 +1431,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
//ToDo:查询是否符合待出库的条件
|
|
|
//ToDo:查询是否符合待出库的条件
|
|
|
//该合同编号下的该车架号的所有认款金额
|
|
|
//该合同编号下的该车架号的所有认款金额
|
|
|
if(v.getSubscribedOf() == 0){ |
|
|
if (v.getSubscribedOf() == 0) { |
|
|
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); |
|
|
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3); |
|
|
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); |
|
|
//查询该合同编号下的销售订单的单车成交价
|
|
|
//查询该合同编号下的销售订单的单车成交价
|
|
@ -2262,7 +2263,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
finSelectedReceivablesDetailed.setAuditState(4); |
|
|
finSelectedReceivablesDetailed.setAuditState(4); |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed); |
|
|
//应收未收将款项加回来
|
|
|
//应收未收将款项加回来
|
|
|
if(v.getSubscribedOf() == 0){ |
|
|
if (v.getSubscribedOf() == 0) { |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(finSelectedReceivablesDetailed.getSubscriptionMoney()); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
|
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney); |
|
@ -2326,20 +2327,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
qw.gt("fcc.balance", 0); |
|
|
qw.gt("fcc.balance", 0); |
|
|
if (StringUtils.isNotBlank(query.getStaffDeptName())){ |
|
|
if (StringUtils.isNotBlank(query.getStaffDeptName())) { |
|
|
qw.like("fcc.staffDeptName",query.getStaffDeptName()); |
|
|
qw.like("fcc.staffDeptName", query.getStaffDeptName()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getStaffName())){ |
|
|
if (StringUtils.isNotBlank(query.getStaffName())) { |
|
|
qw.like("fcc.staffName",query.getStaffName()); |
|
|
qw.like("fcc.staffName", query.getStaffName()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getBillNo())){ |
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
qw.like("fcc.billNo",query.getBillNo()); |
|
|
qw.like("fcc.billNo", query.getBillNo()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getPayerName())){ |
|
|
if (StringUtils.isNotBlank(query.getPayerName())) { |
|
|
qw.like("fcc.payerName",query.getPayerName()); |
|
|
qw.like("fcc.payerName", query.getPayerName()); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getPhone())){ |
|
|
if (StringUtils.isNotBlank(query.getPhone())) { |
|
|
qw.like("bd.draweeMobile",query.getPhone()); |
|
|
qw.like("bd.draweeMobile", query.getPhone()); |
|
|
} |
|
|
} |
|
|
String collectionStartDate = query.getCollectionStartDate(); |
|
|
String collectionStartDate = query.getCollectionStartDate(); |
|
|
String collectionEndDate = query.getCollectionEndDate(); |
|
|
String collectionEndDate = query.getCollectionEndDate(); |
|
@ -2348,10 +2349,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl |
|
|
); |
|
|
); |
|
|
String collectionSmallMoney = query.getCollectionSmallMoney(); |
|
|
String collectionSmallMoney = query.getCollectionSmallMoney(); |
|
|
String collectionBigMoney = query.getCollectionBigMoney(); |
|
|
String collectionBigMoney = query.getCollectionBigMoney(); |
|
|
if (StringUtils.isNotBlank(collectionSmallMoney) && StringUtils.isNotBlank(collectionBigMoney)){ |
|
|
if (StringUtils.isNotBlank(collectionSmallMoney) && StringUtils.isNotBlank(collectionBigMoney)) { |
|
|
qw.between("fcc.balance",collectionSmallMoney,collectionBigMoney); |
|
|
qw.between("fcc.balance", collectionSmallMoney, collectionBigMoney); |
|
|
} |
|
|
} |
|
|
if (StringUtils.isNotBlank(query.getName())){ |
|
|
if (StringUtils.isNotBlank(query.getName())) { |
|
|
qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName())); |
|
|
qw.and(wrapper -> wrapper.like("fcc.billNo", query.getName()).or().like("fcc.staffDeptName", query.getName()).or().like("fcc.staffName", query.getName()).or().like("fcc.payerName", query.getName()).or().like("bd.draweeMobile", query.getName())); |
|
|
} |
|
|
} |
|
|
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq); |
|
|