增加了一些统计修改

username@email.com

2024-09-09 cc170291673472d3cda8d7ea77f6bd3a3b5dbb83

 CoreCms.Net.Repository/Order/CoreCmsPlanOrderRepository.cs

@@ -21,6 +21,7 @@
using CoreCms.Net.Model.ViewModels.UI;
using SqlSugar;
using CoreCms.Net.Model.Entities.Order;
using CoreCms.Net.Model.Entities.baifenbingfa.puhuo;

namespace CoreCms.Net.Repository
{
@@ -83,7 +84,8 @@
            oldModel.createBy = entity.createBy;
            oldModel.upDataBy = entity.upDataBy;
            oldModel.isdelete = entity.isdelete;
            
            oldModel.huaFeiAmount = entity.huaFeiAmount;

            //事物处理过程结束
            var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync();
            jm.code = bl ? 0 : 1;
@@ -169,7 +171,7 @@
        /// <param name="blUseNoLock">是否使用WITH(NOLOCK)</param>
        /// <returns></returns>
        public async Task<IPageList<CoreCmsPlanOrder>> QueryPageAsync(Expression<Func<CoreCmsPlanOrder, bool>> predicate,
            Expression<Func<CoreCmsPlanOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
            Expression<Func<CoreCmsPlanOrder, object>> orderByExpression,  OrderByType orderByType, OtherData otherData, int pageIndex = 1,
            int pageSize = 20, bool blUseNoLock = false)
        {
            RefAsync<int> totalCount = 0;
@@ -189,12 +191,19 @@
                shipMobile = p.shipMobile,
                oldOrderAmount = p.oldOrderAmount,
                keYongAmount = p.keYongAmount,
                huaFeiAmount = p.huaFeiAmount,
                createTime = p.createTime,
                upDataTime = p.upDataTime,
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                
                shengId = p.shengId,
                    shiId = p.shiId,
                    shi = p.shi,
                    quxian = p.quxian,
                    quxianId = p.quxianId,
                    pianqu = p.pianqu,
                    shouhuoAddress = p.shouhuoAddress,
                }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount);
            }
            else
@@ -212,14 +221,40 @@
                shipMobile = p.shipMobile,
                oldOrderAmount = p.oldOrderAmount,
                keYongAmount = p.keYongAmount,
                createTime = p.createTime,
                    huaFeiAmount = p.huaFeiAmount,
                    createTime = p.createTime,
                upDataTime = p.upDataTime,
                createBy = p.createBy,
                upDataBy = p.upDataBy,
                isdelete = p.isdelete,
                
                    shiId = p.shiId,
                    shi = p.shi,
                    quxian = p.quxian,
                    quxianId = p.quxianId,
                    pianqu = p.pianqu,
                    shouhuoAddress = p.shouhuoAddress,
                 

                }).ToPageListAsync(pageIndex, pageSize, totalCount);
            }



            var pagetotal = DbClient.Queryable<CoreCmsPlanOrder>()
               // .GroupBy(it => new { it.CategoryId, it.CategoryName, it.goodsId, it.goodsName, it.productsId, it.productsName, it.price })
               .WhereIF(predicate != null, predicate)
               .Select(p => new CoreCmsPlanOrder
               {
                   oldOrderAmounts = SqlFunc.AggregateSum(p.oldOrderAmount),
                   orderAmounts = SqlFunc.AggregateSum(p.orderAmount),
                   keYongAmounts = SqlFunc.AggregateSum(p.keYongAmount),
               })
                 .First(); // 或者使用 Single/FirstOrDefault 等方法获取结果

            otherData.heji4 = pagetotal.oldOrderAmounts;
            otherData.heji5 = pagetotal.orderAmounts;
            otherData.heji6 = pagetotal.keYongAmounts;

            var list = new PageList<CoreCmsPlanOrder>(page, pageIndex, pageSize, totalCount);
            return list;
        }