提交 e8d93a65 authored 作者: jiangwenye's avatar jiangwenye

结算金额=0的运单,是否已付尾款字段都是“无需支付”

上级 b05eadd9
......@@ -66,6 +66,13 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
);
}
@Override
public boolean updateInvoiceStatusById(Integer id, Integer invoiceStatus){
return update(lUdWrapper()
.eq(SettlementOwner::getId, id)
.set(SettlementOwner::getInvoiceStatus, invoiceStatus)
);
}
@Override
public boolean updatePayment(SettlementOwner settlementOwner) {
return update(lUdWrapper()
......
......@@ -22,6 +22,8 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
boolean updateStatusBySettlementNo(@Param("settlementNo")String settlementNo, @Param("status")Integer status);
boolean updateInvoiceStatusById(@Param("id")Integer id, @Param("invoiceStatus")Integer invoiceStatus);
boolean updatePayment(SettlementOwner settlementOwner);
IPage<SettlementOwner> pageCarrierSettlementOwner(PageCarrierSettlementOwnerParam param);
......
......@@ -110,8 +110,15 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
status = SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode();
}else if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) <0){
status = SettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode();
if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo,SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
}
}else{
if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo,SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
}
status = SettlementOwnerEnum.Status.COMPLETED.getCode();
//保存结算单日志----已完结
settlementLogService.saveSettlementLog(settlementNo,
......@@ -356,7 +363,15 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
settlementOwnerDao.saveExpress(settlementNo,param.getExpressCompany(),param.getExpressNo());
if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0 ){
settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.All_INVOICED.getCode());
settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode());
}else{
settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
}
}
settlementOwnerDao.updateStatusBySettlementNo(settlementNo
,SettlementOwnerEnum.Status.COMPLETED.getCode());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论