Skip to content

C
clx-performance
提交 af9aea95 authored 作者: jiangwenye's avatar jiangwenye
浏览文件
操作

结算单状态变更

上级 5106cbf3
显示空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 46 行删除
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @ af9aea95
...@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -186,34 +187,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic ...@@ -186,34 +187,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
*/ */
private void settlementPeriodMonthUpdate(SettlementOwner settlementOwner, SettlementOwnerDetail settlementOwnerDetail){ private void settlementPeriodMonthUpdate(SettlementOwner settlementOwner, SettlementOwnerDetail settlementOwnerDetail){
BigDecimal weight = settlementOwnerDetail.getWeight(); settlementOwner.setWeight(settlementOwnerDetail.getWeight());
BigDecimal freight = settlementOwnerDetail.getFreight(); settlementOwner.setFreight(settlementOwnerDetail.getFreight());
BigDecimal lossWeight = settlementOwnerDetail.getLossWeight(); settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
BigDecimal lossFreight = settlementOwnerDetail.getLossFreight(); settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
BigDecimal prepayFreight = settlementOwnerDetail.getPrepayFreight(); settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
BigDecimal settlementFreight = settlementOwnerDetail.getSettlementFreight(); settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
BigDecimal invoiceFreight = settlementOwnerDetail.getInvoiceFreight(); settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo()); List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
details.stream().forEach(item->{ details.forEach(item->{
weight.add(item.getWeight()); settlementOwner.setWeight(settlementOwnerDetail.getWeight().add(item.getWeight()));
freight.add(item.getFreight()); settlementOwner.setFreight(settlementOwnerDetail.getFreight().add(item.getFreight()));
lossWeight.add(item.getLossWeight()); settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight().add(item.getLossWeight()));
lossFreight.add(item.getLossFreight()); settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight().add(item.getLossFreight()));
prepayFreight.add(item.getPrepayFreight()); settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight().add(item.getPrepayFreight()));
settlementFreight.add(item.getSettlementFreight()); settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight().add(item.getSettlementFreight()));
invoiceFreight.add(item.getInvoiceFreight()); settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight().add(item.getInvoiceFreight()));
}); });
settlementOwner.setWeight(weight);
settlementOwner.setFreight(freight);
settlementOwner.setLossWeight(lossWeight);
settlementOwner.setLossFreight(lossFreight);
settlementOwner.setPrepayFreight(prepayFreight);
settlementOwner.setSettlementFreight(settlementFreight);
settlementOwner.setInvoiceFreight(invoiceFreight);
settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner); settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
} }
...@@ -259,34 +252,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic ...@@ -259,34 +252,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
*/ */
private void settlementPeriodImmediateUpdate(SettlementOwner settlementOwner,SettlementOwnerDetail settlementOwnerDetail){ private void settlementPeriodImmediateUpdate(SettlementOwner settlementOwner,SettlementOwnerDetail settlementOwnerDetail){
BigDecimal weight = settlementOwnerDetail.getWeight(); settlementOwner.setWeight(settlementOwnerDetail.getWeight());
BigDecimal freight = settlementOwnerDetail.getFreight(); settlementOwner.setFreight(settlementOwnerDetail.getFreight());
BigDecimal lossWeight = settlementOwnerDetail.getLossWeight(); settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
BigDecimal lossFreight = settlementOwnerDetail.getLossFreight(); settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
BigDecimal prepayFreight = settlementOwnerDetail.getPrepayFreight(); settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
BigDecimal settlementFreight = settlementOwnerDetail.getSettlementFreight(); settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
BigDecimal invoiceFreight = settlementOwnerDetail.getInvoiceFreight(); settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo()); List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
details.stream().forEach(item->{ details.forEach(item->{
weight.add(item.getWeight()); settlementOwner.setWeight(settlementOwnerDetail.getWeight().add(item.getWeight()));
freight.add(item.getFreight()); settlementOwner.setFreight(settlementOwnerDetail.getFreight().add(item.getFreight()));
lossWeight.add(item.getLossWeight()); settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight().add(item.getLossWeight()));
lossFreight.add(item.getLossFreight()); settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight().add(item.getLossFreight()));
prepayFreight.add(item.getPrepayFreight()); settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight().add(item.getPrepayFreight()));
settlementFreight.add(item.getSettlementFreight()); settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight().add(item.getSettlementFreight()));
invoiceFreight.add(item.getInvoiceFreight()); settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight().add(item.getInvoiceFreight()));
}); });
settlementOwner.setWeight(weight);
settlementOwner.setFreight(freight);
settlementOwner.setLossWeight(lossWeight);
settlementOwner.setLossFreight(lossFreight);
settlementOwner.setPrepayFreight(prepayFreight);
settlementOwner.setSettlementFreight(settlementFreight);
settlementOwner.setInvoiceFreight(invoiceFreight);
settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner); settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论