From d7c7a6e9d05eec7b38b41b8ae39f373f650ca891 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 15 五月 2024 14:48:03 +0800
Subject: [PATCH] no message

---
 CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index 7801a2a..8ba09f7 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -1,7 +1,7 @@
 /***********************************************************************
- *            Project: CoreCms
+ *            Project: baifenBinfa
  *        ProjectName: 鐧惧垎鍏垫硶绠$悊绯荤粺                               
- *                Web: hhtp://chuanyin.com                     
+ *                Web: http://chuanyin.com                     
  *             Author:                                        
  *              Email:                               
  *         CreateTime: 202403/02   
@@ -19,6 +19,7 @@
 using CoreCms.Net.Model.ViewModels.Basics;
 using CoreCms.Net.Model.ViewModels.DTO.Distribution;
 using SqlSugar;
+using CoreCms.Net.Model.Entities.Distribution;
 
 namespace CoreCms.Net.Repository
 {
@@ -155,7 +156,11 @@
                     updateTime = p.updateTime,
                     verifyTime = p.verifyTime,
                     isDelete = p.isDelete,
-                    UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade)
+                    storeCoordinate = p.storeCoordinate,
+                    UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
+                    DistributionAchievementTotals = SqlFunc.Subqueryable<DistributionAchievement>()
+                     .Where(da => da.userID == p.userId && da.isdelete == false)
+                     .Sum(da => da.achievementTotals),
 
                 })
                 .MergeTable()
@@ -184,7 +189,16 @@
                     updateTime = p.updateTime,
                     verifyTime = p.verifyTime,
                     isDelete = p.isDelete,
-                    UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade)
+                     address = p.address,
+                      areaCode = p.areaCode,
+                    profession = p.profession,
+                     sales=p.sales,
+                    storeCoordinate = p.storeCoordinate,
+                    UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade),
+                     DistributionAchievementTotals= SqlFunc.Subqueryable<DistributionAchievement>()
+                     .Where(da=>da.userID==p.userId&&da.isdelete==false)
+                     .Sum(da=>da.achievementTotals),
+                   
                 })
                 .MergeTable()
                 .OrderByIF(orderByExpression != null, orderByExpression, orderByType)

--
Gitblit v1.9.1