Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

# Conflicts:
#	winsea-haixin-platform-backend/src/main/resources/application-prod.yml

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

@@ -294,13 +294,13 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 }
                                 tranSettlementReport.setSettlementWeight(tranCarInfo.getLoadNetWeight());
                                 //应付
-                                tranSettlementReport.setAmountIngPayable(tranProcessInfo.getTranPrice() * tranSettlementReport.getSettlementWeight());
+                                tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                 //未付
-                                tranSettlementReport.setAmountNotPayable(tranProcessInfo.getTranPrice() * tranSettlementReport.getSettlementWeight());
+                                tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                 tranSettlementReport.setTranCarNo(tranCarInfo.getTranCarNo());
                                 tranSettlementReport.setLoadingWeight(tranCarInfo.getLoadNetWeight());
                                 tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
-                                tranSettlementReport.setTransportPrice(tranProcessInfo.getTranPrice());
+                                tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
                                 tranSettlementReportService.insert(tranSettlementReport);
                                 boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
                                 // 不是退回的单子

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

@@ -178,6 +178,8 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
             //1 修改扣款
             else if (tranSettlementReport.getFlag() == 1) {
                 tranSettlementReport1.setDeductionAmount(tranSettlementReport.getDeductionAmount());
+                tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getAmountIngPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
+                tranSettlementReport1.setAmountNotPayable(tranSettlementReport1.getAmountNotPayable()-Float.valueOf(tranSettlementReport.getDeductionAmount()));
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";