From f43970a061d3c90520b4e8f48caa17a204d9a085 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 15 八月 2024 10:19:38 +0800
Subject: [PATCH] 完供应商自主维护商品api和后台基础管理页面
---
CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
index ca59cf9..a86a68e 100644
--- a/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
+++ b/CoreCms.Net.Repository/Distribution/CoreCmsDistributionRepository.cs
@@ -1,10 +1,10 @@
/***********************************************************************
- * Project: CoreCms
- * ProjectName: 鏍稿績鍐呭绠＄悊绯荤粺
- * Web: https://www.corecms.net
- * Author: 澶х伆鐏�
- * Email: jianweie@163.com
- * CreateTime: 2021/1/31 21:45:10
+ * Project: baifenBinfa
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
@@ -19,11 +19,12 @@
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
{
/// <summary>
- /// 鍒嗛攢鍟嗚〃 鎺ュ彛瀹炵幇
+ /// 缁忛攢鍟嗚〃 鎺ュ彛瀹炵幇
/// </summary>
public class CoreCmsDistributionRepository : BaseRepository<CoreCmsDistribution>, ICoreCmsDistributionRepository
{
@@ -155,7 +156,24 @@
updateTime = p.updateTime,
verifyTime = p.verifyTime,
isDelete = p.isDelete,
- UserGradeId = SqlFunc.Subqueryable<CoreCmsUser>().Where(o => o.id == p.userId).Select(o => o.grade)
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
+ 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),
+ 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()
@@ -184,7 +202,28 @@
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,
+ idCradNumber = p.idCradNumber,
+ schoolName = p.schoolName,
+ 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),
+ 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()
.OrderByIF(orderByExpression != null, orderByExpression, orderByType)
--
Gitblit v1.9.1