username@email.com
2024-09-20 a4f39526873f45396bf778413979293eabb3be07
修改优化查询等
12个文件已修改
471 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 153 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -162,6 +162,16 @@
        }
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
        {
            return _iEC_OrderDAL.GetOrderByIds(orderIds);
        }
        /// <summary>
        /// 订单退款
        /// </summary>
        /// <param name="orderOperate">要更新的订单状态</param>
@@ -273,6 +283,19 @@
            return _iEC_OrderDAL.OldUpdateKaipiaoshenqing(model);
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <param name="ids"></param>
        /// <returns></returns>
        public bool OldUpdateKaipiaoshenqings(EC_OrderExtend model,string ids)
        {
            return _iEC_OrderDAL.OldUpdateKaipiaoshenqings(model, ids);
        }
        /// <summary>
        /// 修改
        /// </summary>
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -174,6 +174,16 @@
        }
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
        {
            return _eC_OrderBasicDAL.GetOrderByIds(orderIds);
        }
        /// <summary>
        /// 根据订单编号获取自动外协订单
        /// </summary>
        /// <param name="orderId">订单编号</param>
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -125,6 +125,13 @@
        EC_OrderBasic SelectModelById(int orderId);
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds);
        /// <summary>
        /// 发起订单属性改变请求
        /// </summary>
        /// <param name="dialogue">请求</param>
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -117,6 +117,14 @@
        /// <returns></returns>
        EC_OrderBasic GetOrderById(int orderId);
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds);
        /// <summary>
        /// 订单退款
        /// </summary>
@@ -161,6 +169,8 @@
        bool OldUpdateKaipiaoshenqing(EC_OrderExtend model);
        bool OldUpdateKaipiaoshenqings(EC_OrderExtend model, string ids);
        bool OldUpdateKaipiaoqueren(EC_OrderExtend model);
        bool OldUpdateQuchudingdan(EC_OrderExtend model);
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -505,6 +505,136 @@
            else
            {
            }
            StringBuilder ssss = new StringBuilder();
            if (int.Parse(searchParam[18].ToString()) > 0)
            {
                var oA_Staffs = _dataBase.SelectModel<OA_Staff>(" * ", " [OA_Staff] ", "[Keyid]='" + searchParam[20] + "'").FirstOrDefault();
                if (!string.IsNullOrEmpty(oA_Staffs.ManageCountry))
                {
                    var sys_CitySites = _dataBase.SelectModel<Sys_CitySite>(" * ", " [Sys_CitySite] ").ToList();
                    var ManageCity = oA_Staffs.ManageCity.Split(',').Where(x => x != "").ToArray();
                    var ManageCountry = (oA_Staffs.ManageCountry + "," + oA_Staffs.ManageCountry1).Split(',').Where(x => x != "").ToArray();
                    int[] intManageCity = new int[ManageCity.Length];
                    for (int i = 0; i < ManageCity.Length; i++)
                    {
                        intManageCity[i] = int.Parse(ManageCity[i]);
                    }
                    int[] intManageCountry = new int[ManageCountry.Length];
                    for (int i = 0; i < ManageCountry.Length; i++)
                    {
                        intManageCountry[i] = int.Parse(ManageCountry[i]);
                    }
                    var city = sys_CitySites.Where(x => intManageCity.Contains(x.Keyid)).ToList();
                    var country = sys_CitySites.Where(x => intManageCountry.Contains(x.Keyid)).ToList();
                    StringBuilder citystring = new StringBuilder();
                    for (int i = 0; i < city.Count; i++)
                    {
                        if (i == city.Count - 1)
                        {
                            citystring.Append("'" + city[i].Name.ToString() + "'");
                        }
                        else
                        {
                            citystring.Append("'" + city[i].Name.ToString() + "',");
                        }
                    }
                    StringBuilder countrystring = new StringBuilder();
                    for (int i = 0; i < country.Count; i++)
                    {
                        if (i == country.Count - 1)
                        {
                            countrystring.Append("'" + country[i].Name.ToString() + "'");
                        }
                        else
                        {
                            countrystring.Append("'" + country[i].Name.ToString() + "',");
                        }
                    }
                    var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid  ", "  axz.FirmId ='" + searchParam[1] + "'and ( ( bxz.City in ( " + citystring.ToString() + ")  and    bxz.County in ( " + countrystring.ToString() + " )   )or axz.AccountManagerId='" + searchParam[20] + "'  or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
                    //return null == result || result.Count < 1 ? null : result[0];
                    for (int i = 0; i < resultsss.Count; i++)
                    {
                        if (i == resultsss.Count - 1)
                        {
                            ssss.Append("'" + resultsss[i].ToString() + "'");
                        }
                        else
                        {
                            ssss.Append("'" + resultsss[i].ToString() + "',");
                        }
                    }
                }
                else
                {
                    var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid  ", "  axz.FirmId ='" + searchParam[1] + "'and ( axz.AccountManagerId='" + searchParam[20] + "'  or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
                    //return null == result || result.Count < 1 ? null : result[0];
                    for (int i = 0; i < resultsss.Count; i++)
                    {
                        if (i == resultsss.Count - 1)
                        {
                            ssss.Append("'" + resultsss[i].ToString() + "'");
                        }
                        else
                        {
                            ssss.Append("'" + resultsss[i].ToString() + "',");
                        }
                    }
                }
                if (string.IsNullOrEmpty(ssss.ToString()))
                {
                    ssss.Append("'4354654657568345429890'");
                }
            }
            else
            {
                var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz  ", "  axz.FirmId ='" + searchParam[1] + "' ").Select(x => x.Keyid).ToList();
                //return null == result || result.Count < 1 ? null : result[0];
                for (int i = 0; i < resultsss.Count; i++)
                {
                    if (i == resultsss.Count - 1)
                    {
                        ssss.Append("'" + resultsss[i].ToString() + "'");
                    }
                    else
                    {
                        ssss.Append("'" + resultsss[i].ToString() + "',");
                    }
                }
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
@@ -582,9 +712,17 @@
                Direction = ParameterDirection.Output
            });
            sqlParms.Add(new SqlParameter()
            {
                ParameterName = "@CorporateClientsId",
                SqlDbType = SqlDbType.VarChar,
                Size=int.MaxValue,
                Value = ssss.ToString()
            });
            IList<EC_OrderBasic> result = null;
            //执行分页存储
            using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller", CommandType.StoredProcedure, sqlParms.ToArray()))
            using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller_Ceshi", CommandType.StoredProcedure, sqlParms.ToArray()))
            {
                result = _dataBase.ReadDataToModel<EC_OrderBasic>(reader);
            }
@@ -1324,6 +1462,19 @@
            return null == result || result.Count == 0 ? null : result[0];
        }
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
        {
            //return _eC_OrderBasicDAL.SelectModelById(orderId);
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("  ob.*,ts.OnlineMoney,ts.LineMoney,ts.UsedCredit,ts.PayedMoney ", "EC_OrderBasic as ob Inner Join Pay_TradingSingle as ts On ( ob.Keyid = ts.OrderId ) ", string.Format(" ob.Keyid  in ({0})", orderIds));
            return null == result || result.Count < 1 ? null : result;
        }
        /// <summary>
        /// 根据订单编号获取自动外协订单 
        /// </summary>
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -608,6 +608,19 @@
            //return null == result || result.Count < 1 ? null : result[0];
        }
        /// <summary>
        /// 根据订单编号获取订单
        /// </summary>
        /// <param name="orderIds">订单编号</param>
        /// <returns></returns>
        public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
        {
            //return _eC_OrderBasicDAL.SelectModelById(orderId);
            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" Keyid in ({0})", orderIds));
            return null == result || result.Count < 1 ? null : result;
        }
        /// <summary>
        /// 获取已支付订单的明细
        /// </summary>
@@ -824,6 +837,50 @@
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool OldUpdateKaipiaoshenqings(EC_OrderExtend model,string ids)
        {
            Model.EC_OrderExtend trueModel = model;
            if (trueModel == null)
            {
                return false;
            }
            SqlParameter KaipiaoshenqingTime = null;
            if (trueModel.KaipiaoshenqingTime.HasValue)
            {
                KaipiaoshenqingTime = new SqlParameter("@KaipiaoshenqingTime", trueModel.KaipiaoshenqingTime);
            }
            else
            {
                KaipiaoshenqingTime = new SqlParameter("@KaipiaoshenqingTime", DBNull.Value);
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    //new SqlParameter("@Keyid",trueModel.Keyid),
                        KaipiaoshenqingTime,
                          new SqlParameter("@Kaipiaoshenqing",trueModel.Kaipiaoshenqing),
                            new SqlParameter("@KaipiaoshenqingCreater",trueModel.KaipiaoshenqingCreater),
                                new SqlParameter("@KaipiaoshenqingId",trueModel.KaipiaoshenqingId),
            };
            string sql = " Update EC_OrderExtend Set KaipiaoshenqingTime=@KaipiaoshenqingTime ,Kaipiaoshenqing=@Kaipiaoshenqing ,KaipiaoshenqingCreater=@KaipiaoshenqingCreater  ,KaipiaoshenqingId=@KaipiaoshenqingId   Where Keyid in ("+ ids + ") ";//@keyid
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 修改
        /// </summary>
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -491,12 +491,12 @@
        showWait();
        var OldOrderId = document.getElementById('txtKeyid').value;
        var ssselPrintTypes = document.getElementById('selPrintTypes').value;
        alert(7);
        //alert(7);
        if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//其他类型
            $("#hidOrderId").val(OldOrderId);
            $("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
            setTimeout(function () {
                alert(8);
                //alert(8);
                if (sel.value != "" || sel.value == "0") {
                    BindControl1(sel.value);
                }
@@ -526,18 +526,18 @@
    //修改反绑数据
    function BindControl1(orderId) {
        alert(1);
       // alert(1);
        if (parseInt(orderId) > 0) {
            $.ajax({
                url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
                type: "POST",
                data: "BindControl1=true&OrderId=" + orderId,
                success: function (dataJsonStr) {
                    alert(2);
                   // alert(2);
                    if (dataJsonStr == null || dataJsonStr == "")
                        return;
                    var dataJson = eval('(' + dataJsonStr + ')');
                    alert(dataJson.PrintTypeId);
                   // alert(dataJson.PrintTypeId);
                    if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
                        $("[name='printSizeName']").val(dataJson.PrintSizeName);
                        $("[name='printCount']").val(dataJson.PrintCount);
@@ -589,7 +589,7 @@
    function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
        alert(4);
        //alert(4);
        $("#hidOrderId").val(OrderId);
        switch (printTypeId) {
            //名片                            
@@ -701,7 +701,7 @@
    //动态加载页面后执行的语句
    function ExcuteCallBack1() {
        alert(5);
       // alert(5);
        var printTypeId = $("#hidPrintTypeId").val();
        $("#selDigitalPrintType").live("change",
@@ -751,7 +751,7 @@
        var ssselprintask = $("#selprintask").val();
        //修改反绑数据
        alert(3);
        //alert(3);
        if (ssselprintask != "" || ssselprintask == "0") {
            BindControl1(ssselprintask);
        }
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -558,10 +558,10 @@
            //   AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
            Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
            {
                PageSize = 10000,// UCPager1.AspNetPager.PageSize,
                PageSize = 500,// UCPager1.AspNetPager.PageSize,
                PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
            };
            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam).Where(x => x.OrderState != 0);//.Where(x=>x.Quchudingdan == 2);
            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x => x.OrderState != 0) .Where(x=>x.Quchudingdan == 2);
            rptData.DataSource = result;
            rptData.DataBind();
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -51,22 +51,33 @@
                decimal total = 0;
                string name = "";
                this.txtOrderIds.Value = orderIdStr;
                string[] idsArray = orderIdStr.Split(',');
                if (idsArray != null && idsArray.Length > 0)
                // string[] idsArray = orderIdStr.Split(',');
                //if (idsArray != null && idsArray.Length > 0)
                //{
                var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
                if(models!=null&& models.Count > 0)
                {                    
                    foreach(var item in idsArray)
                    {
                        var model = _eC_OrderBLL.GetOrderById(int.Parse(item));
                        if (model != null)
                        {
                            total += model.SumPrice??0;
                            if(string.IsNullOrEmpty(name))
                            {
                                name = model.BuyerName;
                    name = models[0].BuyerName;
                            }
                        }
                    }
                }
                total = models.Sum(x=>x.SumPrice)??0;
                    //foreach (var item in idsArray)
                    //{
                    //    var model = _eC_OrderBLL.GetOrderById(int.Parse(item));
                    //    if (model != null)
                    //    {
                    //        total += model.SumPrice??0;
                    //        if(string.IsNullOrEmpty(name))
                    //        {
                    //            name = model.BuyerName;
                    //        }
                    //    }
                    //}
                //}
                kpmoney.InnerText = total.ToString("0.00");
                khname.InnerText = name;
            }
@@ -93,7 +104,17 @@
            {
                EC_OrderBasic eC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(idsArray[0].ToInt32().Value);
                OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, eC_OrderBasic.BuyerId);
                using (TransactionScope scope = new TransactionScope())
                using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
           new TransactionOptions
           {
               IsolationLevel = IsolationLevel.ReadCommitted,
               Timeout = TransactionManager.MaximumTimeout
           }
           )
                    )
                {
                    try
                {
                    string ssss = DateTime.Now.ToString("yyyyMMdd");
                    string SellerOrderId = ssss + 1.ToString("000");
@@ -129,25 +150,35 @@
                    _oA_KaipiaoshenqingBLL.InsertModel(oA_DeliverPlan);
                    DateTime kaipiaoshenqing = DateTime.Now;
                    for (int i = 0; i < idsArray.Length; i++)
                    {
                        //for (int i = 0; i < idsArray.Length; i++)
                        //{
                        bool result = true;
                        EC_OrderExtend model = new EC_OrderExtend();
                        model.Keyid = idsArray[i].ToInt32();
                        //model.Keyid = idsArray[i].ToInt32();
                        model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
                        model.KaipiaoshenqingTime = kaipiaoshenqing;
                        model.Kaipiaoshenqing = 1;
                        model.KaipiaoshenqingId = oA_DeliverPlan.Keyid;
                        result = _eC_OrderBLL.OldUpdateKaipiaoshenqing(model);
                        result = _eC_OrderBLL.OldUpdateKaipiaoshenqings(model, ids);
                        if (!result)
                        {
                            return;
                        }
                    }
                        //}
                    scope.Complete();
                }
                    catch (Exception ex)
                    {
                        // 回滚事务
                    }
                    finally
                    {
                        // 释放资源
                        scope.Dispose();
                    }
                }
                JavaScript.MessageBox("提交成功", this);
                JavaScript.RefreshDIVOpener(this);
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx
@@ -181,7 +181,9 @@
    </tr>
    <tr>
        <td class="contentLeft" colspan='3'>
            &#12288;&#12288;&#12288;&#12288;&#12288;<input type="button" value="确认收款" runat="server"  id='btnSubmit' />
            &#12288;&#12288;&#12288;&#12288;&#12288;<%--<input type="button" value="确认收款" runat="server"  id='btnSubmit' />--%>
              <asp:Button ID="btn_Submit" Text="确认收款" runat="server" OnClick="btn_Submit_form" />
            <input type="hidden"  id="ids" runat="server"  />
        </td>
    </tr>
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.cs
@@ -47,9 +47,12 @@
        protected void Page_Load(object sender, EventArgs e)
        {
            _eC_OrderBasicBLL = new EC_OrderBasicBLL();
            btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
            //btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
            if (!IsPostBack)
            {
            LoadOrder();
            }
            if (IsPostBack || IsCallback)
                return;
            InitPage();
@@ -61,11 +64,15 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        void btnSubmit_ServerClick(object sender, EventArgs e)
        protected void btn_Submit_form(object sender, EventArgs e)
        {
            string[] orderIds = Request["ids"].Split(',');
            var ids = Request["ids"];
            //string[] orderIds = Request["ids"].Split(',');
            string receiveWay = Request["rdoReceiveWay"];
            bool isWin = false;
            using (var scope = new TransactionScope(TransactionScopeOption.Required,
     new TransactionOptions
     {
@@ -74,12 +81,32 @@
     }
 ))
            {
                foreach (string orderId in orderIds)
                try
                {
                    EC_OrderBasic _orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
                    var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(ids);
                    if (string.IsNullOrEmpty(ids) || string.IsNullOrEmpty(receiveWay))
                    {
                        JavaScript.MessageBox("传入参数错误!", this);
                        return;
                    }
                    if (null == _orderBasicmodes)
                    {
                        JavaScript.MessageBox("订单不存在或已删除!", this);
                        return;
                    }
                    int i = 0;
                    foreach (var _orderBasic in _orderBasicmodes)
                    {
                        //EC_OrderBasic _orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
                        if (receiveWay == "0" && i == 0)
                        {
                    OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasic.BuyerId);
                    if (receiveWay == "0" && m_OA_CorporateClients != null)
                            if (m_OA_CorporateClients != null)
                    {
                        if (this.txtReceiveMoney.Value.ToInt32() > (m_OA_CorporateClients.Prepayments + m_OA_CorporateClients.Credit))
                        {
@@ -88,16 +115,15 @@
                            return;
                        }
                    }
                    if (string.IsNullOrEmpty(orderId) || string.IsNullOrEmpty(receiveWay))
                            else
                    {
                        JavaScript.MessageBox("传入参数错误!", this);
                        return;
                                JavaScript.MessageBox("预付款不足!", this, "window.location='/Pages/financial/OrderMoneyBatchReceive.aspx?id=" + Request["ids"] + "'");
                    }
                    if (null == _orderBasic)
                    {
                        JavaScript.MessageBox("订单不存在或已删除!", this);
                        return;
                    }
                        i = i + 1;
                    isWin = "0".Equals(receiveWay) ? UsePrepare(_orderBasic) : ToAccount(_orderBasic.Keyid.Value, _orderBasic.BuyerName, _orderBasic.UnPayedMoney);
                    if (!isWin)
                    {
@@ -107,22 +133,37 @@
                }
                scope.Complete();
            }
                catch (Exception ex)
                {
                    // 回滚事务
                }
                finally
                {
                    // 释放资源
                    scope.Dispose();
                }
            }
             
            if (isWin)
            {
                JavaScript.MessageBox("操作成功", this, true, true);
                JavaScript.MessageBox("操作成功", this);
                JavaScript.RefreshDIVOpener(this);
            }
            else
            {
                JavaScript.MessageBox("操作失败", this);
            }
            //JavaScript.MessageBox(isWin ? "收款成功!" : "收款失败!", this, "top.frmright.ReLoad();top.Dialog.close();");
            Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
            if (!isWin)
                InitPage();
            else
                ;
            //Request.RequestContext.RouteData.DataTokens.Add("IsWin", isWin ? "1" : "");
            //if (!isWin)
            //    InitPage();
            //else
            //    ;
        }
@@ -184,7 +225,7 @@
        {
            string[] orderIds = Request["id"].Split(',');
            this.ids.Value = Request["id"];
            List<EC_OrderBasic> eC_OrderBasics = new List<EC_OrderBasic>();
            //List<EC_OrderBasic> eC_OrderBasics = new List<EC_OrderBasic>();
            decimal shoukuanmoney = 0;
            if (orderIds==null || orderIds.Length==0)
            {
@@ -193,25 +234,26 @@
            try
            {
                foreach (string orderId in orderIds)
                var _orderBasicmodes = _eC_OrderBasicBLL.GetOrderByIds(this.ids.Value);
                foreach (var _orderBasicmode in _orderBasicmodes)
                {
                    EC_OrderBasic _orderBasicmode = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
                    OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasicmode.BuyerId);
                    if (m_OA_CorporateClients != null)
                    {
                        _orderBasicmode.nowCustomMoney = "¥" + (m_OA_CorporateClients.Prepayments ?? 0).ToString("0.00");
                        _orderBasicmode.nowCredit = "¥" + (m_OA_CorporateClients.Credit ?? 0).ToString("0.00");
                    }
                    else
                    {
                        _orderBasicmode.nowCustomMoney = "¥0";
                        _orderBasicmode.nowCredit = "¥0";
                    }
                   // EC_OrderBasic _orderBasicmode = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
                    //OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _orderBasicmode.BuyerId);
                    //if (m_OA_CorporateClients != null)
                    //{
                    //    _orderBasicmode.nowCustomMoney = "¥" + (m_OA_CorporateClients.Prepayments ?? 0).ToString("0.00");
                    //    _orderBasicmode.nowCredit = "¥" + (m_OA_CorporateClients.Credit ?? 0).ToString("0.00");
                    //}
                    //else
                    //{
                    //    _orderBasicmode.nowCustomMoney = "¥0";
                    //    _orderBasicmode.nowCredit = "¥0";
                    //}
                    shoukuanmoney += _orderBasicmode.UnPayedMoney;
                    eC_OrderBasics.Add(_orderBasicmode);
                   // eC_OrderBasics.Add(_orderBasicmode);
                }
                this.txtReceiveMoney.Value = String.Format("{0:F}", shoukuanmoney);
                //rptOrderInfo.DataSource = eC_OrderBasics;
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderMoneyBatchReceive.aspx.designer.cs
@@ -69,13 +69,13 @@
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
        /// <summary>
        /// btnSubmit 控件。
        /// btn_Submit 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
        protected global::System.Web.UI.WebControls.Button btn_Submit;
        /// <summary>
        /// ids 控件。