username@email.com
2024-10-17 b95525c2b6e4409a6b0ef3e9e598123828a4f73a
订单锁单
8个文件已修改
161 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/business/Order.js 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
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>
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;
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>
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") %>)'>
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>
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);