1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -314,12 +314,12 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 //按吨计费
                 if("1".equals(tranSettlementReport1.getBillingMethod())) {
                     //应付=单价x结算重量
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport.getSettlementWeight());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())) * tranSettlementReport.getSettlementWeight());
                 }
                 //按车
                 else{
                     //应付
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())));
                 }
                 //实付金额
                 tranSettlementReport1.setAmountActuallyPaid(tranSettlementReport1.getAmountIngPayable()
@@ -343,12 +343,12 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 //按吨计费
                 if("1".equals(tranSettlementReport1.getBillingMethod())) {
                     //应付=单价x结算重量
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport1.getSettlementWeight());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())) * tranSettlementReport1.getSettlementWeight());
                 }
                 //按车
                 else{
                     //应付
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())));
                 }
 //                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getSettlementWeight()*tranSettlementReport1.getTransportPrice()-Float.valueOf(tranSettlementReport1.getDeductionAmount()));
 //                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountIngPayable()-tranSettlementReport1.getAmountEdPayable());
@@ -385,12 +385,12 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 //按吨计费
                 if("1".equals(tranSettlementReport1.getBillingMethod())) {
                     //应付=单价x结算重量
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport1.getSettlementWeight());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice()))  * tranSettlementReport1.getSettlementWeight());
                 }
                 //按车
                 else{
                     //应付
-                    tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice());
+                    tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())));
                 }
                 //实付金额
                 tranSettlementReport1.setAmountActuallyPaid(tranSettlementReport1.getAmountIngPayable()
@@ -444,7 +444,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                         if (tranSettlementReport2.getLossWeight()!=null&&tranSettlementReport2.getLossWeight()>tranSettlementReport2.getSettlementWeight()*0.001){
                             tranSettlementReport2.setDeductionAmount(tranSettlementReport2.getCargoDamage()*tranSettlementReport2.getGrainPrice());
                             //实付金额
-                            tranSettlementReport2.setAmountActuallyPaid(Double.valueOf(tranSettlementReport2.getTransportPrice()) * tranSettlementReport2.getSettlementWeight()
+                            tranSettlementReport2.setAmountActuallyPaid(tranSettlementReport2.getSettlementPrice() * tranSettlementReport2.getSettlementWeight()
                                     - Double.valueOf(tranSettlementReport2.getDeductionAmount()) - tranSettlementReport2.getServiceCharge());
                             //税点
                             tranSettlementReport2.setTaxPoint(tranSettlementReport2.getAmountActuallyPaid()/0.946*0.054);
@@ -695,12 +695,12 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                     //按吨计费
                     if("1".equals(tranSettlementReport1.getBillingMethod())) {
                         //应付=单价x结算重量
-                        tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport1.getSettlementWeight());
+                        tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())) * tranSettlementReport1.getSettlementWeight());
                     }
                     //按车
                     else{
                         //应付
-                        tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice());
+                        tranSettlementReport1.setAmountIngPayable(Float.valueOf(String.valueOf(tranSettlementReport1.getSettlementPrice())));
                     }
                     //实付金额
                     tranSettlementReport1.setAmountActuallyPaid(tranSettlementReport1.getAmountIngPayable()