From 4d6cbddc0762c0164b072dc59ac8e0d51a0199ba Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 21 五月 2024 14:40:15 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs | 14 ++++++++++++++
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs | 1 +
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 16 ++++++++++++----
CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs | 8 ++++++++
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
index bb8b263..0b1f57d 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionOrderPartial.cs
@@ -65,5 +65,13 @@
public List<CoreCmsDistributionOrderDetails> distributionOrderDetails { get; set; }
+ /// <summary>
+ /// 璁㈠崟鐘舵��
+ /// </summary>
+ [Display(Name = "璁㈠崟鐘舵��")]
+ [SugarColumn(IsIgnore = true)]
+ public int OderState { get; set; }
+
+
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
index 621bec7..6d0856c 100644
--- a/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
+++ b/CoreCms.Net.Model/Entities/Distribution/CoreCmsDistributionPartial.cs
@@ -171,5 +171,6 @@
{
get; set;
}
+
}
}
\ No newline at end of file
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 3dc415c..7ffa8d8 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -161,9 +161,14 @@
DistributionAchievementTotals = SqlFunc.Subqueryable<DistributionAchievement>()
.Where(da => da.userID == p.userId && da.isdelete == false)
.Sum(da => da.achievementTotals),
- DistributionKeLingTotals=SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x=>x.isSettlement==(int )GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo&&x.userId==p.userId).Sum(x => x.amount),
- DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
- DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId).Sum(x => x.amount),
+ DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x=>x.isSettlement==(int )GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo&&x.userId==p.userId && SqlFunc.Subqueryable<CoreCmsOrder>().Where(z => z.orderId == x.orderId).Select(z => z.confirmStatus) == (int)GlobalEnumVars.OrderConfirmStatus.ReceiptNotConfirmed).Sum(x => x.amount),
+ DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>()
+ .Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId&&SqlFunc.Subqueryable<CoreCmsOrder>().Where(z=>z.orderId==x.orderId).Select(z=>z.confirmStatus)==(int )GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt)
+
+ .Sum(x => x.amount),
+ DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>()
+ .Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId)
+ .Sum(x => x.amount),
})
.MergeTable()
@@ -201,8 +206,11 @@
DistributionAchievementTotals= SqlFunc.Subqueryable<DistributionAchievement>()
.Where(da=>da.userID==p.userId&&da.isdelete==false)
.Sum(da=>da.achievementTotals),
- DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
DistributionYingLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId).Sum(x => x.amount),
+ DistributionKeLingTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>()
+ .Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo && x.userId == p.userId && SqlFunc.Subqueryable<CoreCmsOrder>().Where(z => z.orderId == x.orderId).Select(z => z.confirmStatus) == (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt)
+
+ .Sum(x => x.amount),
DistributionYiJieSuanTotals = SqlFunc.Subqueryable<CoreCmsDistributionOrder>().Where(x => x.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && x.userId == p.userId).Sum(x => x.amount),
})
diff --git a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
index b34a3d2..004e030 100644
--- a/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
+++ b/CoreCms.Net.Services/Distribution/CoreCmsDistributionServices.cs
@@ -103,6 +103,20 @@
info.TotalSettlementAmount = await _distributionOrderRepository.GetSumAsync(
p => p.isSettlement != (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementCancel && p.userId == userId,
p => p.amount);
+ var lisdata = await _unitOfWork.GetDbClient().Queryable<CoreCmsDistributionOrder>().Where(x=>x.userId == userId&&x.isSettlement== (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementNo)
+ .Select(x=>new CoreCmsDistributionOrder
+ {
+ amount = x.amount,
+ OderState= SqlFunc.Subqueryable<CoreCmsOrder>().Where(c=>c.orderId==x.orderId).Select(c=>c.confirmStatus),
+
+ }).WithCache(10).ToListAsync();
+ //鍙閲戦
+ info.DistributionKeLingTotals = lisdata.Where(x=>x.OderState== (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt
+ || x.OderState == (int)GlobalEnumVars.OrderShipStatus.Yes).Sum(x=>x.amount);
+
+ //搴旈閲戦
+ info.DistributionYingLingTotals = lisdata.Where(x => x.OderState == (int)GlobalEnumVars.OrderConfirmStatus.ReceiptNotConfirmed
+ || x.OderState == (int)GlobalEnumVars.OrderShipStatus.Yes).Sum(x => x.amount); ;
//宸茬粨绠楅噾棰�
info.SettlementAmount = await _distributionOrderRepository.GetSumAsync(
p => p.isSettlement == (int)GlobalEnumVars.DistributionOrderSettlementStatus.SettlementYes && p.userId == userId,
--
Gitblit v1.9.1