1

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

@@ -498,7 +498,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                         //合同已请粮款金额
                         Double money = 0d;
                         //合同保证金余额+预付款余额
-                        money = contractManagementInfo.getAccumulatedPrepayment() - contractManagementInfo.getAccumulatedRecovery() - contractManagementInfo.getPrepaidAssigned() + contractManagementInfo.getAccumulatedMargin() - contractManagementInfo.getWithdrawalOfMargin() - contractManagementInfo.getAllocatedMargin();
+//                        money = contractManagementInfo.getAccumulatedPrepayment() - contractManagementInfo.getAccumulatedRecovery() - contractManagementInfo.getPrepaidAssigned() + contractManagementInfo.getAccumulatedMargin() - contractManagementInfo.getWithdrawalOfMargin() - contractManagementInfo.getAllocatedMargin();
                         List<ExpenseInfo> expenseInfoList = this.selectList(new EntityWrapper<ExpenseInfo>()
                                 .eq("contract_no", expenseInfo.getContractNo())
                                 .ne("status", "已驳回")
@@ -936,7 +936,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                             //合同已请粮款金额
                             Double money = 0d;
                             //合同保证金余额+预付款余额
-                            money = contractManagementInfo.getAccumulatedPrepayment() - contractManagementInfo.getAccumulatedRecovery() - contractManagementInfo.getPrepaidAssigned() + contractManagementInfo.getAccumulatedMargin() - contractManagementInfo.getWithdrawalOfMargin() - contractManagementInfo.getAllocatedMargin();
+//                            money = contractManagementInfo.getAccumulatedPrepayment() - contractManagementInfo.getAccumulatedRecovery() - contractManagementInfo.getPrepaidAssigned() + contractManagementInfo.getAccumulatedMargin() - contractManagementInfo.getWithdrawalOfMargin() - contractManagementInfo.getAllocatedMargin();
                             List<ExpenseInfo> expenseInfoList = this.selectList(new EntityWrapper<ExpenseInfo>()
                                     .eq("contract_no", expenseInfo1.getContractNo())
                                     .ne("status", "已驳回")