From a3022b7241480fd71dae97443d98f12e313056be Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 26 十月 2022 17:22:30 +0800
Subject: [PATCH] 修复24-25日反馈的bug
---
web/web/GwOrder.ashx | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index 69e25ce..6718de6 100644
--- a/web/web/GwOrder.ashx
+++ b/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("璇烽�夋嫨鐭俊璐﹀彿锛�");
}
--
Gitblit v1.9.1