From b95525c2b6e4409a6b0ef3e9e598123828a4f73a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 17 十月 2024 15:57:21 +0800
Subject: [PATCH] 订单锁单
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 47 +++++++++++++++
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 22 +++++++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 11 +++
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs | 27 +++++++++
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 15 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 9 ++
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 8 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 22 +++++++
8 files changed, 160 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 8d97fd8..c6c67a2 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -122,6 +122,17 @@
}
/// <summary>
+ /// 閿佸畾璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="operator">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ public bool SuodingOrder(int orderId, string operater)
+ {
+ return _eC_OrderBasicDAL.SuodingOrder(orderId, operater);
+ }
+
+ /// <summary>
/// 鎵归噺鍙楃悊璁㈠崟
/// </summary>
/// <param name="orderIds"></param>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index f82425d..f620fa7 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -80,6 +80,14 @@
bool AcceptOrder(int orderId, double commission);
/// <summary>
+ /// 鍙楃悊璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="operator">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ bool SuodingOrder(int orderId, string operater);
+
+ /// <summary>
/// 鎵归噺鍙楃悊璁㈠崟
/// </summary>
/// <param name="orderIds"></param>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
index b2450d2..ce51109 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -246,6 +246,33 @@
get;
set;
}
+
+
+
+ /// <summary>
+ /// 閿佸崟鐘舵��
+ /// </summary>
+ public bool? SuodanState
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 閿佸崟鏃堕棿
+ /// </summary>
+ public DateTime? SuodanTime
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 閿佸崟鎿嶄綔浜�
+ /// </summary>
+ public string SuodanOperator
+ {
+ get;
+ set;
+ }
/// <summary>
/// 瀹屽伐澶囨敞
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 3a86f41..dfe6cfe 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -927,6 +927,21 @@
this.yssldw = isChange ? MyConvert.ConvertToString(value) : this.yssldw;
theValue = this.yssldw;
}
+ else if ("SuodanState".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 97)
+ {
+ this.SuodanState = isChange ? MyConvert.ConvertToBoolean(value) : this.CompledState;
+ theValue = this.SuodanState;
+ }
+ else if ("SuodanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 98)
+ {
+ this.SuodanTime = isChange ? MyConvert.ConvertToDateTime(value) : this.SuodanTime;
+ theValue = this.SuodanTime;
+ }
+ else if ("SuodanOperator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 99)
+ {
+ this.SuodanOperator = isChange ? MyConvert.ConvertToString(value) : this.SuodanOperator;
+ theValue = this.SuodanOperator;
+ }
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 4795903..fb2a15a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1382,6 +1382,53 @@
}
+
+
+ /// <summary>
+ /// 閿佸崟璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="operater">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ public bool SuodingOrder(int orderId, string operater)
+ {
+ if (0 >= orderId || 0 >= orderId)
+ {
+ return false;
+ }
+ else
+ {
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@SuodanState",true),
+ new SqlParameter("@SuodanTime",DateTime.Now),
+ new SqlParameter("@SuodanOperator",operater),
+ new SqlParameter("@Keyid",orderId),
+ };
+ IList<SqlParameter> sqlParms1 = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",orderId),
+ };
+ try
+ {
+ string sql = "Update EC_OrderBasic Set [SuodanState]=@SuodanState,[SuodanTime]=@SuodanTime,[SuodanOperator]=@SuodanOperator where [Keyid] =@Keyid ";
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+
+ string sql1 = "Update CoreCmsPlanOrder Set [status]=2 where [orderkeyid] =@Keyid ";
+ _dataBase.ExecuteSql(sql1, sqlParms1.ToArray<SqlParameter>());
+
+
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
/// <summary>
/// 鎵归噺鍙楃悊璁㈠崟
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index fbe5a95..d267260 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=6" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -358,6 +358,9 @@
<th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
鍙楃悊
</th>
+ <th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="閿佸崟">
+ 閿佸崟
+ </th>
<th width="26" >
灏佺
</th>
@@ -470,6 +473,10 @@
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
</td>
+ <td >
+ <span <%#"37" == Eval("PrintTypeId").ToString()? "style='display:block;'" : "style='display:none;'" %> <%#true.Equals(Eval("SuodanState"))?"title='宸查攣鍗�'":"title='閿佸崟'"%> onclick="<%#true.Equals(Eval("SuodanState"))?"":"ToSuodan("+Eval("Keyid")+",'"+Eval("SellerOrderId")+"')"%>">
+ <%#true.Equals(Eval("SuodanState")) ? "鈭�" : "閿佸崟"%></span>
+ </td>
<td >
<%-- <span class="hand look" title="鏌ョ湅鎴栨墦鍗�" onclick='ShowOrder(<%#Eval("Keyid") %>)'>鎵撳嵃</span>--%>
<span class="hand_yes" <%#true.Equals(Eval("IsPrintfengqian"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrderFengqian(<%#Eval("Keyid") %>)'>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index f53930f..fe545c7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -105,6 +105,9 @@
case "AcceptOrder":
Accept();
break;
+ case "SuodanOrder":
+ Suodan();
+ break;
case "AcceptOrderAll":
AcceptAll();
break;
@@ -278,6 +281,25 @@
Response.Write(_eC_OrderBasicBLL.AcceptOrder(orderId.Value, commission.Value) ? "1" : "0");
}
+
+ /// <summary>
+ /// 閿佸崟
+ /// </summary>
+ private void Suodan()
+ {
+ Response.Clear();
+ int? orderId = string.IsNullOrEmpty(Request["id"]) ? null : MyConvert.ConvertToInt32(Request["id"]);
+ if (!orderId.HasValue)
+ {
+ Response.Write("-2");
+ return;
+ }
+ else
+ {
+ }
+ Response.Write(_eC_OrderBasicBLL.SuodingOrder(orderId.Value, CurrentUser.ShortName) ? "1" : "0");
+ }
+
/// <summary>
/// 鎵归噺鍙楃悊璁㈠崟
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index e1241fc..f7a528f 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -50,6 +50,28 @@
});
}
+
+
+/*
+纭鍙楃悊
+*/
+function ToSuodan(orderId, orderShowId) {
+
+
+ var msg ='纭閿佸崟璁㈠崟:' + orderShowId + '?';
+ top.Dialog.confirm(msg, function () {
+ CallServer({ Target: "SuodanOrder", id: orderId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '閿佸崟杩囩▼涓彂鐢熷紓甯革紝璇烽噸鏂板彈鐞嗭紒' : '閿佸崟澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ });
+}
+
///鎵归噺鍙楃悊
function ToAllAccept() {
var commission = parseFloat(document.getElementById('txtCommission').value);
--
Gitblit v1.9.1