多项优化

wzp

2022-11-23 c052583025ff87735d2120dc63aeee7ea5e5524e

多项优化

 web/.vs/Web/FileContentIndex/1bc43914-da5e-4a96-8aec-a027603c8eb5.vsidx

Binary files differ

 web/.vs/Web/FileContentIndex/54ad995a-69de-48b5-8633-7a86a3b5b0e5.vsidx

Binary files differ

 web/.vs/Web/FileContentIndex/54d13018-9b98-4cb8-82e4-60d957fd21bd.vsidx

Binary files differ

 web/.vs/Web/FileContentIndex/read.lock

 web/.vs/Web/v16/.suo

Binary files differ

 web/Dao/GwOrderDao.cs

@@ -229,13 +229,12 @@
            if (string.IsNullOrEmpty(orderId))
                return false;
            //status:4-取消
            return OracleHelper.ExecuteSql("update GW_ORDER SET BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL, PAY_AMOUNT=:PAY_AMOUNT, BEFORE_BALANCE_NUM=:BEFORE_BALANCE_NUM, STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection
            return OracleHelper.ExecuteSql("update GW_ORDER SET BASIC_NUM=:BASIC_NUM, GIVING_NUM=:GIVING_NUM, ORDER_NUM_TOTAL=:ORDER_NUM_TOTAL, ORDER_AMOUNT_TOTAL=:ORDER_AMOUNT_TOTAL, PAY_AMOUNT=:PAY_AMOUNT, STATUS = :STATUS where ORDER_ID=:ORDER_ID", OracleHelper.Connection
                , new OracleParameter(":BASIC_NUM", (object)basicNum)
                , new OracleParameter(":GIVING_NUM", (object)givingNum)
                , new OracleParameter(":ORDER_NUM_TOTAL", (object)orderNumTotal)
                , new OracleParameter(":ORDER_AMOUNT_TOTAL", (object)orderAmountTotal)
                , new OracleParameter(":PAY_AMOUNT", (object)payAmount)
                , new OracleParameter(":BEFORE_BALANCE_NUM", (object)beforeGivingNum)
                , new OracleParameter(":STATUS", (object)orderStatus)
                , new OracleParameter(":ORDER_ID", (object)orderId)
                ) > 0;
@@ -308,7 +307,7 @@
            builder.Append(" LEFT JOIN ( ");
            builder.Append(" SELECT order_id, max(audit_time) update_time FROM gw_order_audit goa ");
            builder.Append(" GROUP BY order_id ");
            builder.Append(" ) b ON b.order_id = a.order_id ");
            builder.Append($" ) b ON b.order_id = a.order_id where update_time>=TO_date('{DateTime.Now.Date}','yyyy-MM-dd HH24:mi:ss')  ");
            builder.Append(" ) ");
            builder.Append(" WHERE 1=1 AND status=2 ");
            //builder.Append(" AND update_time=:UPDATE_TIME ");
@@ -380,7 +379,7 @@
            o.OrderId = oracleReaderWrapper.GetString("ORDER_ID", "");
            o.SpId = oracleReaderWrapper.GetString("SP_ID", "");
            o.ClientId = oracleReaderWrapper.GetString("CLIENT_ID", ""); 
            o.Company = oracleReaderWrapper.GetString("Client_Name", "");
            o.Company = oracleReaderWrapper.GetString("COMPANY", "");
            o.ClientName = oracleReaderWrapper.GetString("CLIENT_NAME", "");
            o.ProductId = oracleReaderWrapper.GetString("PRODUCT_ID", "");
            o.ProductName = oracleReaderWrapper.GetString("PRODUCT_NAME", "");

 web/Dao/GwSpDao.cs

@@ -249,7 +249,7 @@
            return list1;
        }

        public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string clientName, int routerType, string opID, int chargeType, int pageIndex, int pageSize
        public List<GwSp> LoadInfoList(string spId, string apId, string clientId, string company, int routerType, string opId, int chargeType, int pageIndex, int pageSize
            , string resendStatus, string productId, string permissionsSQL, out int recordCount)
        {
            List<GwSp> list1 = new List<GwSp>();
@@ -288,9 +288,9 @@
                list2.Add(new OracleParameter(":ClientID", (object)('%' + clientId + '%')));
                stringBuilder.Append(" and CLIENT_ID like :ClientID");
            }
            if (clientName != null && clientName != "")
            if (company != null && company != "")
            {
                stringBuilder.Append(" and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE CLIENT_NAME like '%" + clientName + "%' )");
                stringBuilder.Append(" and CLIENT_ID IN (SELECT CLIENT_ID FROM GW_CLIENT WHERE COMPANY like '%" + company + "%' )");
            }
            /**
            if (chargeType > 0)
@@ -309,20 +309,20 @@
                {
                    list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
                    stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
                    if (!string.IsNullOrEmpty(opID))
                    if (!string.IsNullOrEmpty(opId))
                    {
                        stringBuilder.Append(" and (CM_OP_ID=:OPID) OR (CT_OP_ID=:OPID) OR (UN_OP_ID=:OPID) ");
                        list2.Add(new OracleParameter(":OPID", (object)opID));
                        list2.Add(new OracleParameter(":OPID", (object)opId));
                    }
                }
                if (routerType == 3)
                {
                    list2.Add(new OracleParameter(":ROUTER_TYPE", (object)routerType));
                    stringBuilder.Append(" and ROUTER_TYPE=:ROUTER_TYPE");
                    if (!string.IsNullOrEmpty(opID))
                    if (!string.IsNullOrEmpty(opId))
                    {
                        stringBuilder.Append(" and (CM_GROUP_ID=:OPID) OR (CU_GROUP_ID=:OPID) OR (CT_GROUP_ID=:OPID) ");
                        list2.Add(new OracleParameter(":OPID", (object)opID));
                        list2.Add(new OracleParameter(":OPID", (object)opId));
                    }
                }
            }

 web/Lib/Dao.dll

Binary files differ

 web/Lib/Dao.pdb

Binary files differ

 web/web/Bin/Dao.dll

Binary files differ

 web/web/Bin/Dao.pdb

Binary files differ

 web/web/Bin/UMCLib.dll

Binary files differ

 web/web/GwClient.aspx

@@ -1,11 +1,17 @@
<%@ Page Language="C#" MasterPageFile="~/Main.master" AutoEventWireup="true" CodeFile="GwClient.aspx.cs" Inherits="_GwClient" %>

<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
    <script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
    <%--<link href="css/plugins/bootstrap-fileinput/fileinput.min.css" rel="stylesheet"/>
    <script src="js/plugins/bootstrap-fileinput/fileinput.min.js" type="text/javascript"></script>--%>
    <script type="text/javascript">
        $(document).ready(function () {
            $("textarea").numberedtextarea();

            //全选
            $("#checkAll").click(function () {
                $("input[name='checkbox']").prop("checked", $(this).is(":checked"));
            });

            $(document).on("click", ".action-query", function () {
                loadPageList();
@@ -369,10 +375,9 @@
            return pwd;
        }

        //全选
        $("#checkAll").click(function () {
            $("input[name='checkbox']").prop("checked", $(this).is(":checked"));
        });
        



        //批量分配个性产品:打开界面
        $(document).on("click", ".action-modal-setProduct", function () {

 web/web/GwOrder.ashx

@@ -173,8 +173,8 @@
                //str1 = str1 + "<td>" + bean.Remark + "</td>";

                str1 += "<td  class=\"text-right\">";
                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;查看</a> ", (object) bean.OrderId);
                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-audit btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;审核</a> ", (object) bean.OrderId);
                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-detail btn  btn-info btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;查看</a> ", (object) bean.OrderId);
                str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" style=\"margin-top:10px; \" class=\"action-modal-audit btn  btn-success btn-xs\"><i class=\"fa fa-edit\"></i>&nbsp;审核</a> ", (object) bean.OrderId);
                if(bean.Status == 0) {
                    str1 += string.Format("<a href=\"javascript:;\" data-orderid=\"{0}\" class=\"action-modal-cancel btn  btn-success btn-xs\"><i class=\"fa fa-search\"></i>&nbsp;取消</a> ", (object) bean.OrderId);
                }
@@ -237,7 +237,7 @@
                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>";
@@ -671,6 +671,12 @@
        productId = gwSp.ProductId;
        price = gwSp.Price;


        if (string.IsNullOrEmpty(gwSp.ProductId))
        {
            throw new ArgumentException("产品配置不允许为空！请先配置账号所关联产品！");
        }

        orderNumTotal = basicNum + givingNum;
        orderAmountTotal = basicNum * price;


 web/web/GwOrderCreate.aspx

@@ -178,11 +178,15 @@
            var givingNum = $("#givingNum").val();
            var remark = $("#remark").val();

            let _basicNum = $("#_basicNum").val();
            let _givingNum = $("#_givingNum").val();
            let beforeBalanceNum = parseInt(_basicNum) + parseInt(_givingNum);

            mytek.confirm("是否确定充值？", "是否操作！", function (b) {

                if (b) {

                    $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, price: price, payAmount:payAmount, basicNum: basicNum, givingNum: givingNum, remark: remark }, function (r) {
                    $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, price: price, payAmount: payAmount, basicNum: basicNum, givingNum: givingNum, remark: remark, beforeBalanceNum: beforeBalanceNum }, function (r) {

                        mytek.alert(r.Message, r.OK, function () {
                            if (r.OK) {

 web/web/GwOrderList.aspx

@@ -129,17 +129,19 @@
    class="form-inline">
    <div class="ibox">
        <div class="input-group m-b">
            <span class="input-group-addon">客户账号</span>
            <span class="input-group-addon">短信账号</span>
            <input type="text" name="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
        </div>

        <div class="input-group m-b">
            <span class="input-group-addon">客户账户</span>
            <input type="text" name="ClientID" id="ClientID" value="<%=ClientId %>" class="form-control" />
        </div>
        <div class="input-group m-b">
            <span class="input-group-addon">公司名称</span>
            <input type="text" name="Company" id="Company" class="form-control " />
        </div>
        <div class="input-group m-b">
            <span class="input-group-addon">短信账号</span>
            <input type="text" name="SpID" id="SpID" value="<%=SpID %>" class="form-control" />
        </div>
        
        <div class="input-group m-b">
            <div class="input-daterange input-group " id="datepicker">
                <span class="input-group-addon">时间范围&nbsp;<i class="fa fa-calendar"></i></span>
@@ -165,8 +167,9 @@
                    </th>
                    <th>短信账号
                    </th>
                    <th>客户账号
                    <th>客户账户
                    </th>
                    <th>公司名称</th>
                    <th>产品名称
                    </th>
                    <%--<th>套餐ID
@@ -240,7 +243,7 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                客户账号</label>
                                客户账户</label>
                            <div class="col-sm-4 ">
                                <!--
                                <select name="clientId" id="clientId" class="form-control">

 web/web/GwSp.ashx

@@ -307,17 +307,17 @@
        string string1 = context.GetString("apID");
        string clientId = context.GetString("clientID");
        string string2 = context.GetString("spID");
        string string3 = context.GetString("opID");
        string opId = context.GetString("opID");
        int int1 = context.GetInt("routerType");
        string string4 = context.GetString("clientName");
        string company = context.GetString("company");
        int int2 = context.GetInt("chargeType");
        int recordCount = 0;
        int int3 = context.GetInt("pageSize", 20);
        int int4 = context.GetInt("pageIndex", 1);
        int int5 = context.GetInt("resendStatus", 1);
        string productId = context.GetString("productId")==null? "": context.GetString("productId");
        if (!string.IsNullOrEmpty(string3) && int1 <= 0)
            throw new ArgumentException("请选择通道组路由模式");
        if (!string.IsNullOrEmpty(opId) && int1 <= 0)
        { throw new ArgumentException("请选择通道组路由模式"); }
        GwSpDao gwSpDao = new GwSpDao();
        string apId = "0";
        if (this.IsInt(string1))
@@ -328,7 +328,7 @@
        string permissionsSQL = new GwClientDao().GetClientPermissions(_userId, _userType, null);

        //加载账号列表信息
        List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, string4, int1, string3, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
        List<GwSp> list = gwSpDao.LoadInfoList(string2, apId, clientId, company, int1, opId, int2, int4, int3, int5.ToString(), productId, permissionsSQL, out recordCount);
        string str1 = "";
        if (list != null && list.Count > 0)
        {

 web/web/GwSp.aspx

@@ -2,7 +2,7 @@
<asp:Content runat="server" ID="Content1" ContentPlaceHolderID="head">
    <link href="../static/select2/select2.css" type="text/css" rel="stylesheet" />
    <script src="../static/select2/select2.js" language="javascript" type="text/javascript"></script>
 
    <script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
    
    <script type="text/javascript" language="javascript">
        $(document).ready(function() {
@@ -17,14 +17,14 @@
                var clientID = $("#clientID").val();
                var opID = $("#opID").val();
                var routerType = $("#routerType").val();
                var clientName = $("#clientName").val();
                var company = $("#company").val();
                var chargeType = $("#chargeType").val();
                var resendStatus = $("#RESEND_STATUS").val();
                var productId = $("#productId").val();
                $.ajax({
                    url: "GwSp.ashx",
                    type: "POST",
                    data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, clientName: clientName, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
                    data: { action: "loadGwSpAccountPageList", spID: spID, apID: apID, opID: opID, routerType: routerType, clientID: clientID, company: company, chargeType: chargeType, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize(), resendStatus: resendStatus, productId: productId },
                    success: function(result) {
                        if (result.OK) {
                            $("#gwspTable tbody").html(result.Message.Table);
@@ -90,6 +90,7 @@
                    data: { idArray: $.toJSON(idArray), cmopID: cmopID, ctopID: ctopID, unopID: unopID, cmGroupID: cmGroupID, cuGroupID: cuGroupID, ctGroupID: ctGroupID, action: "batchUpdateOp" },
                    success: function(result) {
                        mytek.alert(result.Message, result.OK, function() {
                            $("#opDialog").modal("hide");
                            loadPageList();
                        });
                    }
@@ -403,20 +404,20 @@
            -->
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">客户账号</span>
                    <span class="input-group-addon">客户账户</span>
                    <input type="text" name="clientID" id="clientID" class="form-control col-md-2" />
                </div>
            </div>
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">客户名称</span>
                    <input type="text" name="clientName" id="clientName" class="form-control col-md-2" />
                    <span class="input-group-addon">公司名称</span>
                    <input type="text" name="company" id="company" class="form-control col-md-2" />
                </div>
            </div>
            
            <div class="form-group">
                <div class="input-group m-b">
                    <span class="input-group-addon">通道名</span>
                    <span class="input-group-addon">通道ID</span>
                    <input type="text" name="opID" id="opID" class="form-control col-md-2" />
                </div>
            </div>
@@ -461,7 +462,7 @@
             <div class="form-group">
                <div class="input-group m-b">
                    <select name="RESEND_STATUS" class="form-control" id="RESEND_STATUS">
                        <option value="3">自动补发</option>
                        <option value="3">--补发设置--</option>
                        <option value="1">启用补发</option>
                        <option value="0">停用补发</option>
                    </select>

 web/web/Main.master

@@ -26,9 +26,9 @@
<script src="js/jquery.min.js?v=2.1.4"></script>


<!--调试启用，正式使用禁用
<!--调试启用，正式使用禁用-->
<script type="text/javascript" src="/web/js/jquery.min.js?v=2.1.4"></script>
    -->
    
 

    <!-- 增加了type="text/javascript"-->