SMGW_NewWeb.git

parent: 88c3d1f7 | 补丁 | 提交 | show whitespace

yzh

2022-05-11 148b7e632c249c2a9d1dd077de3d181737bb37b6

订单列表增加充值金额；客户列表增加账户余额；累计充值金额除以1000

7个文件已修改

	web/.vs/Web/v16/.suo	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwClient.ashx	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwClient.aspx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwOrder.ashx	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwOrderAudit.aspx	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwOrderComplete.aspx	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	web/web/GwOrderList.aspx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 web/.vs/Web/v16/.suo

Binary files differ

 web/web/GwClient.ashx

@@ -89,7 +89,9 @@
                    {
                        Certification_StatusResult = "已认证";
                    }
                    str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
                    //edit:yangzh by 20220511
                    //str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
                    str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "元</td><td>" + item.Top_up_Amount_Total/1000 + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";

                    str += @"<td>";
                    string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;

 web/web/GwClient.aspx

@@ -388,6 +388,8 @@
                    </th>
                    <th>联系电话
                    </th>
                    <th>账户余额
                    </th>
                    <th>累计充值
                    </th>


 web/web/GwOrder.ashx

@@ -88,7 +88,8 @@
                str1 = str1 + "<td>" + bean.GivingNum + "</td>";
                str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
                str1 = str1 + "<td>" + bean.Creator + "</td>";
                str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -145,7 +146,8 @@
                str1 = str1 + "<td>" + bean.GivingNum + "</td>";
                str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
                str1 = str1 + "<td>" + bean.Creator + "</td>";
                str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -221,7 +223,8 @@
                str1 = str1 + "<td>" + bean.GivingNum + "</td>";
                str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
                str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
                str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
                str1 = str1 + "<td>" + bean.Creator + "</td>";
                str1 = str1 + "<td>" + bean.CreateTime + "</td>";

 web/web/GwOrderAudit.aspx

@@ -55,8 +55,6 @@
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
                $("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
                $("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
                //$("#orderDialog #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

@@ -93,8 +91,6 @@
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
                $("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
                $("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
                //$("#orderDialog #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

@@ -261,6 +257,8 @@
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
                    <th>创建人

 web/web/GwOrderComplete.aspx

@@ -40,23 +40,22 @@

                //$("#orderDialog .modal-title").text("订单明细");
                //$("#orderDialog #action").val("detail");
                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
                $("#orderDialog #spId").val(r.Message.SpId);
                $("#orderDialog #clientId").val(r.Message.ClientId);
                $("#orderDialog #productId").val(r.Message.ProductId);
                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", "readonly");
                $("#orderDialog #spId").val(r.Message.SpId).attr("readonly", "readonly");
                $("#orderDialog #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
                $("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
                //$("#orderDialog #comboId").val(r.Message.ComboId);
                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0);
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0);
                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00);
                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0);
                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0);
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0);
                $("#orderDialog #creator").val(r.Message.Creator);
                $("#orderDialog #createTime").val(r.Message.CreateTime);
                //$("#orderDialog #auditor").valval(r.Message.Auditor);
                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
                $("#orderDialog #status").val(r.Message.Status);
                $("#orderDialog #remark").val(r.Message.Remark);
                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", "readonly");
                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00).attr("readonly", "readonly");
                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0).attr("readonly", "readonly");
                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0).attr("readonly", "readonly");
                $("#orderDialog #payAmount").val(r.Message.PayAmount / 1000, 0).attr("readonly", "readonly");
                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
                $("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
                $("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

                $("#orderDialog").modal("show");
            }, "json");
@@ -151,6 +150,8 @@
                    <th>订单总条数
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
@@ -283,6 +284,17 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                充值金额</label>
                            <div class="col-sm-4">
                                <div class="input-group">
                                <input type="text" class="form-control" name="payAmount" id="payAmount" value="" maxlength="10"
                                    onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
                                    oncontextmenu="return false" /><span class="input-group-addon">元 </span>
                                </div>
                            </div>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-2 control-label">
                                充值前账号余额</label>
                            <div class="col-sm-4">
                                <div class="input-group">

 web/web/GwOrderList.aspx

@@ -149,6 +149,8 @@
                    </th>
                    <th>订单总金额（元）
                    </th>
                    <th>充值金额（元）
                    </th>
                    <th>充值前账号余额（条）
                    </th>
                    <th>创建人

			@@ -89,7 +89,9 @@
			{
			Certification_StatusResult = "已认证";
			}
			str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
			//edit:yangzh by 20220511
			//str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
			str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "元</td><td>" + item.Top_up_Amount_Total/1000 + "元</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";

			str += @"<td>";
			string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;

			@@ -388,6 +388,8 @@
			</th>
			<th>联系电话
			</th>
			<th>账户余额
			</th>
			<th>累计充值
			</th>

			@@ -88,7 +88,8 @@
			str1 = str1 + "<td>" + bean.GivingNum + "</td>";
			str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
			str1 = str1 + "<td>" + bean.Creator + "</td>";
			str1 = str1 + "<td>" + bean.CreateTime + "</td>";
			@@ -145,7 +146,8 @@
			str1 = str1 + "<td>" + bean.GivingNum + "</td>";
			str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
			str1 = str1 + "<td>" + bean.Creator + "</td>";
			str1 = str1 + "<td>" + bean.CreateTime + "</td>";
			@@ -221,7 +223,8 @@
			str1 = str1 + "<td>" + bean.GivingNum + "</td>";
			str1 = str1 + string.Format("<td>{0}元/条</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
			str1 = str1 + string.Format("<td>{0}元</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
			str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
			str1 = str1 + "<td>" + bean.Creator + "</td>";
			str1 = str1 + "<td>" + bean.CreateTime + "</td>";

			@@ -55,8 +55,6 @@
			$("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
			$("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
			$("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
			//$("#orderDialog #auditor").valval(r.Message.Auditor);
			//$("#orderDialog #auditTime").val(r.Message.AuditTime);
			$("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
			$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

			@@ -93,8 +91,6 @@
			$("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
			$("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
			$("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
			//$("#orderDialog #auditor").valval(r.Message.Auditor);
			//$("#orderDialog #auditTime").val(r.Message.AuditTime);
			$("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
			$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

			@@ -261,6 +257,8 @@
			</th>
			<th>订单总金额（元）
			</th>
			<th>充值金额（元）
			</th>
			<th>充值前账号余额（条）
			</th>
			<th>创建人

			@@ -40,23 +40,22 @@

			//$("#orderDialog .modal-title").text("订单明细");
			//$("#orderDialog #action").val("detail");
			$("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
			$("#orderDialog #spId").val(r.Message.SpId);
			$("#orderDialog #clientId").val(r.Message.ClientId);
			$("#orderDialog #productId").val(r.Message.ProductId);
			$("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", "readonly");
			$("#orderDialog #spId").val(r.Message.SpId).attr("readonly", "readonly");
			$("#orderDialog #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
			$("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
			//$("#orderDialog #comboId").val(r.Message.ComboId);
			$("#orderDialog #basicNum").val(r.Message.BasicNum, 0);
			$("#orderDialog #givingNum").val(r.Message.GivingNum, 0);
			$("#orderDialog #price").val(r.Message.Price / 1000, 0.00);
			$("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0);
			$("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0);
			$("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0);
			$("#orderDialog #creator").val(r.Message.Creator);
			$("#orderDialog #createTime").val(r.Message.CreateTime);
			//$("#orderDialog #auditor").valval(r.Message.Auditor);
			//$("#orderDialog #auditTime").val(r.Message.AuditTime);
			$("#orderDialog #status").val(r.Message.Status);
			$("#orderDialog #remark").val(r.Message.Remark);
			$("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", "readonly");
			$("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
			$("#orderDialog #price").val(r.Message.Price / 1000, 0.00).attr("readonly", "readonly");
			$("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0).attr("readonly", "readonly");
			$("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0).attr("readonly", "readonly");
			$("#orderDialog #payAmount").val(r.Message.PayAmount / 1000, 0).attr("readonly", "readonly");
			$("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
			$("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
			$("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
			$("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
			$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");

			$("#orderDialog").modal("show");
			}, "json");
			@@ -151,6 +150,8 @@
			<th>订单总条数
			</th>
			<th>订单总金额（元）
			</th>
			<th>充值金额（元）
			</th>
			<th>充值前账号余额（条）
			</th>
			@@ -283,6 +284,17 @@
			</div>
			<div class="form-group">
			<label class="col-sm-2 control-label">
			充值金额</label>
			<div class="col-sm-4">
			<div class="input-group">
			<input type="text" class="form-control" name="payAmount" id="payAmount" value="" maxlength="10"
			onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
			oncontextmenu="return false" /><span class="input-group-addon">元 </span>
			</div>
			</div>
			</div>
			<div class="form-group">
			<label class="col-sm-2 control-label">
			充值前账号余额</label>
			<div class="col-sm-4">
			<div class="input-group">

			@@ -149,6 +149,8 @@
			</th>
			<th>订单总金额（元）
			</th>
			<th>充值金额（元）
			</th>
			<th>充值前账号余额（条）
			</th>
			<th>创建人