修复24-25日反馈的bug

wzp

2022-10-26 a3022b7241480fd71dae97443d98f12e313056be

 web/web/GwOrder.ashx

@@ -22,8 +22,8 @@
    private List<GwOp> _OpList;
    private List<GwOpGroup> _GroupList;
    private List<GwProduct> _ProductList;   //产品及产品分类
    //private List<GwProduct> _ProductClassList;  //产品分类
    
                                            //private List<GwProduct> _ProductClassList;  //产品分类

    private int _userId = -1;
    private string _userType = "";
    private string _account = "";
@@ -77,7 +77,7 @@
        int recordCount = 0;
        int pageSize = context.GetInt("pageSize", 50);
        int pageIndex = context.GetInt("pageIndex", 1);
            

        string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");

        List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, compay, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
@@ -91,8 +91,8 @@
            {
                ++num;

                //str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
                str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<td>" + bean.SpId + "</td>";
                str1 = str1 + "<td>" + bean.ClientId + "</td>";
                str1 = str1 + "<td>" + bean.Company + "</td>";
                str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
@@ -139,7 +139,7 @@
        int recordCount = 0;
        int pageSize = context.GetInt("pageSize", 50);
        int pageIndex = context.GetInt("pageIndex", 1);
            

        string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");

        List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, company, flag, startDate, endDate.AddDays(1.0), pageSize, pageIndex, permissionsSQL, out recordCount);
@@ -153,8 +153,8 @@
            {
                ++num;

                //str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
                str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<td>" + bean.SpId + "</td>";
                str1 = str1 + "<td>" + bean.ClientId + "</td>";
                str1 = str1 + "<td>" + bean.Company + "</td>";
                str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
@@ -219,7 +219,7 @@
        int recordCount = 0;
        int pageSize = context.GetInt("pageSize", 50);
        int pageIndex = context.GetInt("pageIndex", 1);
            

        string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, "GWC");

        //List<GwOrder> list = _Dao.LoadInfoList(spId, clientId, clientName, flag, Convert.ToDateTime(startDate), Convert.ToDateTime(endDate).AddDays(1.0), pageSize, pageIndex, out recordCount);
@@ -234,10 +234,10 @@
            {
                ++num;

                //str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<tr><td>" + bean.SpId + "</td>";
                str1 += "<tr><td>" + bean.OrderId + "</td>";
                str1 = str1 + "<td>" + bean.SpId + "</td>";
                str1 = str1 + "<td>" + bean.ClientId + "</td>";
                str1 = str1 + "<td>" + bean.Company + "</td>";
                //str1 = str1 + "<td>" + bean.Company + "</td>";
                str1 = str1 + "<td>" + ProductToName(bean.ProductId) + "</td>";
                //str1 = str1 + "<td>" + bean.ComboId + "</td>";
                str1 = str1 + "<td>" + bean.BasicNum + "</td>";
@@ -461,7 +461,7 @@
            Int64 topUpAmountTotal = 0;
            if (string.IsNullOrEmpty(nextFlowCode))
            {
                orderStatus = 2;                    
                orderStatus = 2;

                //获取账号信息
                GwSp gwSp = _GwSpDao.Get(spId);
@@ -496,7 +496,7 @@
                    //gwClient.Balance = ((balance + payAmount) - num * basicNum) ;   //充值余额:单位（厘）
                    //gwClient.Top_up_Amount_Total = topUpAmountTotal + payAmount;    //充值金额:单位（厘）
                    //gwClient.ClientID = clientId;
                    

                    //更新客户充值数据
                    _GwClientDao.UpdateClientAmount(payAmount-( num * basicNum), payAmount, clientId );
                }
@@ -795,15 +795,17 @@
    //根据主键获取产品或产品分类信息
    private JsonPageResult Get(PageContext<SysUser> context)
    {
        return new JsonPageResult(true, this._Dao.Get(context.GetString("orderId")));
        GwOrder gwOrder = _Dao.Get(context.GetString("orderId"));

        return new JsonPageResult(true,gwOrder);
    }

    //根据客户API账号获取充值初始信息
    private JsonPageResult GetOrderBySpId(PageContext<SysUser> context)
    {
        string spId = context.GetString("spId");
            
            if (!string.IsNullOrEmpty(spId))

        if (!string.IsNullOrEmpty(spId))
        {
            GwSp  gwSp = new GwSpDao().Get(spId);
            if(gwSp==null)
@@ -817,7 +819,7 @@

            }

            

            GwOrder gwOrder = new GwOrder();

            GwClient gwClient = new GwClient();
@@ -828,19 +830,19 @@
                gwOrder.Balance = long.Parse(gwClient.Balance.ToString() );    //余额
            }

                gwOrder.SpId = gwSp.SpID;
                gwOrder.ClientId = gwSp.ClientID;
                gwOrder.ProductId = gwSp.ProductId;
                gwOrder.ProductName = gwSp.ProductName;
                gwOrder.Price = gwSp.Price;
                gwOrder.BasicNum = gwSp.BasicNum;  //基本条数
                gwOrder.GivingNum = gwSp.GivingNum;                
                
            gwOrder.SpId = gwSp.SpID;
            gwOrder.ClientId = gwSp.ClientID;
            gwOrder.ProductId = gwSp.ProductId;
            gwOrder.ProductName = gwSp.ProductName;
            gwOrder.Price = gwSp.Price;
            gwOrder.BasicNum = gwSp.BasicNum;  //基本条数
            gwOrder.GivingNum = gwSp.GivingNum;

            return new JsonPageResult(true, gwOrder);
        }
        else
        {
             throw new ArgumentException("请选择短信账号！");
            throw new ArgumentException("请选择短信账号！");

        }