修改

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

@@ -183,6 +183,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         //卸车不为空时，结算重量=装卸取小
                                         tranSettlementReport.setSettlementWeight(tranCarInfo.getLoadNetWeight() > tranCarInfo.getUnloadNetWeight() ? tranCarInfo.getUnloadNetWeight() : tranCarInfo.getLoadNetWeight());
                                     }
+                                    //扣款
+                                    if(tranSettlementReport.getLossWeight() <= (tranCarInfo.getLoadNetWeight()/1000)){
+                                        tranSettlementReport.setDeductionAmount("0");
+                                    }
+                                    else{
+                                        tranSettlementReport.setDeductionAmount(String.valueOf((Float.valueOf(tranCarInfo.getLoadNetWeight()-tranCarInfo.getUnloadNetWeight()) - (tranCarInfo.getLoadNetWeight()/1000)) * Float.valueOf(tranCarInfo.getTranPrice())));
+                                    }
                                     tranSettlementReportService.updateById(tranSettlementReport);
                                 }
                             }

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

@@ -101,28 +101,6 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                         tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
                     }
                 }
-                //扣款
-                if(tranSettlementReport1.getLossWeight() <= (tranSettlementReport1.getLoadingWeight()/1000)){
-                    tranSettlementReport1.setDeductionAmount("0");
-                }
-                else{
-                    tranSettlementReport1.setDeductionAmount(String.valueOf((Float.valueOf(tranSettlementReport1.getLossWeight()) - (tranSettlementReport1.getLoadingWeight()/1000)) * tranSettlementReport1.getTransportPrice()));
-                }
-//                //结算重量
-//                if ("0".equals(tranSettlementReport1.getManualFlag())){
-//                    //卸车为空时，结算重量=装车重量
-//                    if (tranSettlementReport1.getUnloadingWeight() == null){
-//                        tranSettlementReport1.setSettlementWeight(tranSettlementReport1.getLoadingWeight());
-//                    }
-//                    //卸车不为空时，结算重量=装卸取小
-//                    else {
-//                        tranSettlementReport1.setSettlementWeight(tranSettlementReport1.getLoadingWeight() > tranSettlementReport1.getUnloadingWeight() ? tranSettlementReport1.getUnloadingWeight() : tranSettlementReport1.getLoadingWeight());
-//
-//                    }
-//                }
-                //应付金额
-                //已付金额
-                //未付金额
             }
 //                String taskId = "";
 //                // 只有待审核状态才有taskId