From a22806795fa54d1a403e242b1eef6d83e7538c9b Mon Sep 17 00:00:00 2001
From: feng <279202647@qq.com>
Date: Fri, 20 May 2022 21:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8E=A5=E5=8F=97=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuiYan/pricetasklogBusiness.cs               | 16 +++++++++++++++-
 src/Coldairarrow.Entity/HuiYan/pricetasklog.cs   |  5 +++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
index d31677d..852b503 100644
--- a/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
+++ b/src/Coldairarrow.Business/HuiYan/pricetasklogBusiness.cs
@@ -245,6 +245,8 @@ namespace Coldairarrow.Business.HuiYan
 
             var result = Db.RunTransaction(() =>
             {
+                string orderId = DateTime.Now.ToString("yyyyMMddHHmmssff");
+
                 var price = new pricetasklog()
                 {
                     CreateTime = DateTime.Now,
@@ -254,7 +256,8 @@ namespace Coldairarrow.Business.HuiYan
                     ItemId = teamItem.ItemId,
                     UserId = _operator.UserId,
                     State = PriceTaskState.待比价,
-                    TeamItemId = teamItem.Id
+                    TeamItemId = teamItem.Id,
+                    OrderId = orderId
                 };
 
                 int  row = Db.Insert(price);
@@ -276,6 +279,17 @@ namespace Coldairarrow.Business.HuiYan
             {
                 return Success("接取任务成功！");
             }
+            else {
+                if (result.ex.Message.Contains("teamiderror"))
+                {
+                    return Error("任务已被接取！");
+                }
+
+                if (result.ex.Message.Contains("orderiderror"))
+                {
+                    return Error("任务接取失败，请重试！");
+                }
+            }
 
             return Error(result.ex.Message);
         }
diff --git a/src/Coldairarrow.Entity/HuiYan/pricetasklog.cs b/src/Coldairarrow.Entity/HuiYan/pricetasklog.cs
index 449616a..cf4f4bc 100644
--- a/src/Coldairarrow.Entity/HuiYan/pricetasklog.cs
+++ b/src/Coldairarrow.Entity/HuiYan/pricetasklog.cs
@@ -57,5 +57,10 @@ namespace Coldairarrow.Entity.HuiYan
         /// 审核提交时间,超过24小时将自动完成
         /// </summary>
         public DateTime? WorkDate { get; set; }
+
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public string OrderId { get; set; }
     }
 }
\ No newline at end of file