From 9e2f3d1c793207fbc599a82bab0464075d777f1f Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 14 六月 2024 11:31:56 +0800
Subject: [PATCH] no message
---
CoreCms.Net.Services/baifenbingfa/DistributorDeliveryServices.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Services/baifenbingfa/DistributorDeliveryServices.cs b/CoreCms.Net.Services/baifenbingfa/DistributorDeliveryServices.cs
index c2f751b..3406cd0 100644
--- a/CoreCms.Net.Services/baifenbingfa/DistributorDeliveryServices.cs
+++ b/CoreCms.Net.Services/baifenbingfa/DistributorDeliveryServices.cs
@@ -19,6 +19,7 @@
using CoreCms.Net.Configuration;
using Newtonsoft.Json;
using CoreCms.Net.DTO;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressDeliveryOpenMessageGetDeliveryListResponse.Types;
namespace CoreCms.Net.Services.baifenbingfa
{
@@ -84,7 +85,19 @@
//蹇呴』鏄湁鏁堢姸鎬�
//where= where.And(x => x.order.status == (int)GlobalEnumVars.OrderStatus.Normal);
RefAsync<int> totl = 0;
- var list= await _unitOfWork.GetDbClient().Queryable<CoreCmsBillDelivery>().Includes(x => x.order, order => order.Orderitems, ite => ite.productInfo)
+ var list = await _unitOfWork.GetDbClient().Queryable<CoreCmsBillDelivery>().Includes(x => x.order, order => order.Orderitems, ite => ite.productInfo).Select(x => new CoreCmsBillDelivery
+ {
+ sendDistributionAccept = x.sendDistributionAccept == sendDistributionAcceptType.NoAccted ?
+ //鐢ㄦ埛娌℃湁鍚屾剰浣嗘槸璁㈠崟宸茬粡鍙栨秷浜� 闇�瑕佽祴鍊� 鍙栨秷鐘舵��
+ (x.order.status== (int)GlobalEnumVars.OrderStatus.Normal ? sendDistributionAcceptType.NoAccted: sendDistributionAcceptType.Cancelled ):
+ (
+ x.sendDistributionAccept== sendDistributionAcceptType.Accepted?
+ //鐢ㄦ埛宸茬粡鍚屾剰浜�
+ (x.order.confirmStatus == (int)GlobalEnumVars.OrderConfirmStatus.ConfirmReceipt? sendDistributionAcceptType.Delivered: sendDistributionAcceptType.Accepted)
+ : x.order.status==(int )GlobalEnumVars.OrderStatus.Cancel? sendDistributionAcceptType.Cancelled: x.sendDistributionAccept
+ ),
+ order=x.order,
+ },true).MergeTable()
.Where(where).OrderByDescending(x => x.createTime)
.ToPageListAsync(Param.page, Param.limit, totl);
var listdata= new PageList<CoreCmsBillDelivery>(list, Param.page, Param.limit, totl);
--
Gitblit v1.9.1