From 6ee81c7ad9a4a12fdb019abd5f6315065298eeb8 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 18 Dec 2024 13:34:30 +0800 Subject: [PATCH] no message --- .../service/fee/pojo/DefaultApplyBillManager.java | 11 +++++------ .../service/fee/pojo/DefaultBillFeeManager.java | 4 ++-- .../server/service/fee/pojo/DefaultFeeManager.java | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultApplyBillManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultApplyBillManager.java index ec35843..a51d196 100644 --- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultApplyBillManager.java +++ b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultApplyBillManager.java @@ -1365,11 +1365,9 @@ public Double initTaxMoney(Map map){ * 支付确认 */ public void saveInvoicePay(List ids,String invoiceNo,Date issuingDate,String transferVoucher){ - long invoiceId=0; for(Long invoiceID :ids){ Invoice invoice=this.commonDao.load(Invoice.class, invoiceID); - invoiceId=invoiceID; invoice.setIssuingDate(issuingDate); invoice.setCashFee(invoice.getBillingFee()); invoice.setTransferVoucher(transferVoucher); @@ -1395,19 +1393,20 @@ public Double initTaxMoney(Map map){ invoice.setInvoiceState(FeeStatus.VERIFICATION); commonDao.store(invoice); - } + //回写调度单上的支付状态 - if(invoiceId>0){ + if(invoiceID>0){ List idss = commonDao.findByQuery("select f.billId from Fee f where f.applyBillDetail.invoice.id=:id and f.billObject='SHIPMENT' group by f.billId ", - new String[] { "id"},new Object[] {invoiceId}); + new String[] { "id"},new Object[] {invoiceID}); for(Long id :idss){ Shipment s =this.load(Shipment.class, id); s.setNeedSinglePrice(true);//已支付 commonDao.store(s); } } - } + +} public void saveInvoicePay(ApplyBillDetail ad,String invoiceNo,Date issuingDate,int taxRate,double ticketMat,double outTicketMat,double turnover,String payOrReceive){ diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java index 3d68077..f78a7ba 100644 --- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java +++ b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultBillFeeManager.java @@ -321,10 +321,10 @@ public class DefaultBillFeeManager extends DefaultBaseManager implements BillFee public void Refresh(Long BillFeeID){ BillFee b = commonDao.load(BillFee.class,BillFeeID); List Objects1 = commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f " - + " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费') ", + + " where f.billFee.id =:id and f.feeName.name not in ('其他费','油卡费','预付款') ", new String[] { "id"},new Object[] {BillFeeID}); List Objects2 = commonDao.findByQuery("select COALESCE(sum(f.totalFee),0) from Fee f " - + " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费') ", + + " where f.billFee.id =:id and f.feeName.name in ('其他费','油卡费','预付款') ", new String[] { "id"},new Object[] {BillFeeID}); b.setTotalFee((Double)Objects1.get(0)-(Double)Objects2.get(0)); commonDao.store(b); diff --git a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java index 6b27a64..9ac7670 100644 --- a/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java +++ b/src/main/java/com/dev/stms/server/service/fee/pojo/DefaultFeeManager.java @@ -477,6 +477,9 @@ public class DefaultFeeManager extends DefaultBaseManager implements FeeManager order.setFee9(s.getFee7()/Legss.size());//实际成本 order.setProfit(DoubleUtils.format3Fraction(order.getReceivefee()-order.getFee9()));//利润 order.setFee5(s.getFee6()); + order.setDriverName(s.getDriverName()); + order.setVehicleCode(s.getLicense()); + order.setExpectLicense(s.getVehicleType().getName()); commonDao.store(order); } }