From 80aa425c4ca51f7c0224a6245968cdd08940321b Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 13 六月 2024 10:17:30 +0800
Subject: [PATCH] 修改校园代理 完成
---
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs
index d3665c6..4f46918 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsBillDeliveryController.cs
@@ -16,6 +16,7 @@
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.Filter;
+using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
@@ -24,6 +25,7 @@
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Extensions;
using CoreCms.Net.Web.Admin.Infrastructure;
+using DotLiquid.Util;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@@ -47,19 +49,25 @@
private readonly ICoreCmsBillDeliveryItemServices _itemServices;
private readonly ICoreCmsLogisticsServices _logisticsServices;
private readonly IWebHostEnvironment _webHostEnvironment;
+ private readonly IUnitOfWork _unitOfWork;
+ private readonly ICoreCmsDistributionOrderServices _coreCmsDistributionOrderServices;
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
public CoreCmsBillDeliveryController(IWebHostEnvironment webHostEnvironment,
ICoreCmsBillDeliveryServices coreCmsBillDeliveryServices, ICoreCmsAreaServices areaServices,
- ICoreCmsBillDeliveryItemServices itemServices, ICoreCmsLogisticsServices logisticsServices)
+ ICoreCmsBillDeliveryItemServices itemServices
+ , ICoreCmsLogisticsServices logisticsServices
+ , IUnitOfWork sugarUnitOfWork, ICoreCmsDistributionOrderServices coreCmsDistributionOrderServices)
{
_webHostEnvironment = webHostEnvironment;
_coreCmsBillDeliveryServices = coreCmsBillDeliveryServices;
_areaServices = areaServices;
_itemServices = itemServices;
_logisticsServices = logisticsServices;
+ _unitOfWork = sugarUnitOfWork;
+ _coreCmsDistributionOrderServices = coreCmsDistributionOrderServices;
}
#region 鑾峰彇鍒楄〃============================================================
@@ -221,8 +229,19 @@
if (!string.IsNullOrEmpty(item.logiCode))
{
+
+ if (item.logiCode == "Distributor")
+ {
+ //鏄緵搴斿晢渚涜揣锛岄偅涔堥渶瑕佽幏鍙栦緵搴斿晢淇℃伅
+ var dis = await _unitOfWork.GetDbClient().Queryable<CoreCmsDistribution>().Where(x => x.id == item.sendDistributionID).FirstAsync();
+ if (dis != null)
+ item.logiName = $"鍒嗛厤缁欑粡閿�鍟嗗彂璐э紙{dis.name} -- {dis.schoolName}锛�";
+ }
+ else
+ {
var logiModel = logist.Find(p => p.logiCode == item.logiCode);
if (logiModel != null) item.logiName = logiModel.logiName;
+ }
}
}
}
@@ -363,9 +382,24 @@
if (!string.IsNullOrEmpty(model.logiCode))
{
- var logiModel = await _logisticsServices.QueryByClauseAsync(p => p.logiCode == model.logiCode);
- ;
- if (logiModel != null) model.logiName = logiModel.logiName;
+ if (model.logiCode == "Distributor")
+ {
+ //鏄緵搴斿晢渚涜揣锛岄偅涔堥渶瑕佽幏鍙栦緵搴斿晢淇℃伅
+ var dis = await _unitOfWork.GetDbClient().Queryable<CoreCmsDistribution>().Where(x => x.id == model.sendDistributionID).FirstAsync();
+ if (dis != null)
+ {
+ model.logiName = $"鍒嗛厤缁欑粡閿�鍟嗗彂璐э紙{dis.name} -- {dis.schoolName}锛�";
+ model.distributionAcceptStr = model.sendDistributionAccept?.GetDescription()??"鏈‘璁ゆ帴鍙楀垎閰�";
+ }
+
+ }
+ else
+
+ {
+ var logiModel = await _logisticsServices.QueryByClauseAsync(p => p.logiCode == model.logiCode);
+ if (logiModel != null) model.logiName = logiModel.logiName;
+ }
+
}
var items = await _itemServices.QueryListByClauseAsync(p => p.deliveryId == model.deliveryId,
--
Gitblit v1.9.1