From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index 08ec057..ae887b2 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -105,7 +105,7 @@
CooperOrderDTO cooperOrderDTO = _cooperOrderService.Get(OrderId);
List<FiOrderrecievemoneyDTO> fiOrderrecievemoneyDTOs = _fiOrderrecievemoneyService.GetList(OrderId);
- dto.Money = cooperOrderDTO.Money.Value - (cooperOrderDTO.Youhui??0);
+ dto.Money = cooperOrderDTO.Money.Value;
if(fiOrderrecievemoneyDTOs!=null&& fiOrderrecievemoneyDTOs.Count > 0)
{
dto.YishouMoney = fiOrderrecievemoneyDTOs.Sum(x => x.Recievemoney).Value;
@@ -180,11 +180,13 @@
data1.RecordTypeId = "1";//鏀跺叆
data1.Department = "";
- resultEntity = _iFiAccountRecordService.save(data1);
+
firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) + data1.Money;
firmAccount.Balance = (firmAccount.Balance ?? 0) + data1.Money;
+ data1.AccountMoney = firmAccount.Balance;
+ resultEntity = _iFiAccountRecordService.save(data1);
resultEntity = _fiAccountService.save(firmAccount);
scope.Complete();
}
--
Gitblit v1.9.1