From 73e00247164939388fe6e88654a5f182dcd08d1b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 一月 2023 09:33:54 +0800
Subject: [PATCH] 订单撤单增加填写扯单原因
---
zhengcaioa/Services/CooperatecustomCustomerService.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 2a60265..36b9928 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -55,12 +55,43 @@
if (String.IsNullOrEmpty(cooperatecustomCustomer.Id))
{
+ if (!string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl))
+ {
+ cooperatecustomCustomer.Ywjltime = DateTime.Now;
+ var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
+ var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
+ if (Cooper + Inten >= 1000)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�1000锛�";
+ return resultEntity;
+ }
+ }
+
cooperatecustomCustomer.Id = Guid.NewGuid().ToString();
_context.CooperatecustomCustomers.Add(cooperatecustomCustomer);
}
else
{
var updateproject = _context.CooperatecustomCustomers.Find(cooperatecustomCustomer.Id);
+
+ if (!string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl) && (string.IsNullOrEmpty(updateproject.Ywjl) || !string.IsNullOrEmpty(updateproject.Ywjl) && cooperatecustomCustomer.Ywjl != updateproject.Ywjl))
+ {
+ updateproject.Ywjltime = DateTime.Now;
+ var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
+ var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl);
+ if (Cooper + Inten >= 1000)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ヤ笟鍔＄粡鐞嗭紝瀹㈡埛鍗曚綅鍜屽悎浣滃鎴峰悎璁¤秴杩�1000锛�";
+ return resultEntity;
+ }
+ }
+ if (string.IsNullOrEmpty(cooperatecustomCustomer.Ywjl))
+ {
+ updateproject.Ywjltime = DateTime.Now;
+ }
+
updateproject.Sheng = cooperatecustomCustomer.Sheng;
updateproject.City = cooperatecustomCustomer.City;
@@ -272,7 +303,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Khly) || a.Khly == searchEntity.Khly.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Hyfl) || a.Hyfl == searchEntity.Hyfl.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Khlx) || a.Khlx == searchEntity.Khlx.Trim())
- && (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim())
+ //&& (string.IsNullOrWhiteSpace(searchEntity.Ywjl) || a.Ywjl == searchEntity.Ywjl.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
@@ -340,17 +371,29 @@
Taocanjianshu = a.Taocanjianshu ?? 0,
Customertype = "鍚堜綔瀹㈡埛",
}
- ).OrderByDescending(x => x.Modifytime).ToList();
+ );
+
+ if (!string.IsNullOrWhiteSpace(searchEntity.Ywjl))
+ {
+ if (searchEntity.Ywjl != "11111")
+ {
+ query = query.Where(a => a.Ywjl == searchEntity.Ywjl.Trim());
+ }
+ else
+ {
+ query = query.Where(a => a.Ywjl == null);
+ }
+ }
//if (searchEntity.totalrows == 0)
- searchEntity.totalrows = query.Count();
+ searchEntity.totalrows = query.Count();
data.Heji1 = Math.Round(query.Sum(x => x.Yufukuan) ?? 0, 2);
data.Heji2 = Math.Round(query.Sum(x => x.Shouxinedu) ?? 0, 2);
data.Heji3 = Math.Round(query.Sum(x => x.Shenyushouxin) ?? 0, 2);
data.Heji4 = Math.Round(query.Sum(x => x.Moneycountde) ?? 0, 2);
- var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ var lianlist = query.OrderByDescending(x => x.Modifytime).Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Yufukuan) ?? 0, 2);
data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shouxinedu) ?? 0, 2);
data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Shenyushouxin) ?? 0, 2);
--
Gitblit v1.9.1