baifenbaishop.git

			@@ -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)