|
@@ -60,9 +60,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
|
|
|
|
|
- Fields.Add("OrderNo", "1"); //订单号
|
|
|
|
|
- Fields.Add("RealName", "1"); //姓名
|
|
|
|
|
- Fields.Add("Mobile", "1"); //手机号
|
|
|
|
|
Fields.Add("ErpCode", "1"); //运单号
|
|
Fields.Add("ErpCode", "1"); //运单号
|
|
|
Fields.Add("TradeNo", "1"); //支付交易号
|
|
Fields.Add("TradeNo", "1"); //支付交易号
|
|
|
Fields.Add("StoreContact", "1"); //仓库联系人
|
|
Fields.Add("StoreContact", "1"); //仓库联系人
|
|
@@ -80,17 +77,17 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//渠道订单号
|
|
//渠道订单号
|
|
|
if (!string.IsNullOrEmpty(TradeNo))
|
|
if (!string.IsNullOrEmpty(TradeNo))
|
|
|
{
|
|
{
|
|
|
- condition += " and TradeNo=" + TradeNo;
|
|
|
|
|
|
|
+ condition += " and TradeNo='" + TradeNo + "'";
|
|
|
}
|
|
}
|
|
|
//收件人姓名
|
|
//收件人姓名
|
|
|
if (!string.IsNullOrEmpty(RealName))
|
|
if (!string.IsNullOrEmpty(RealName))
|
|
|
{
|
|
{
|
|
|
- condition += " and RealName=" + RealName;
|
|
|
|
|
|
|
+ condition += " and RealName='" + RealName + "'";
|
|
|
}
|
|
}
|
|
|
//收件人电话
|
|
//收件人电话
|
|
|
if (!string.IsNullOrEmpty(Mobile))
|
|
if (!string.IsNullOrEmpty(Mobile))
|
|
|
{
|
|
{
|
|
|
- condition += " and Mobile=" + Mobile;
|
|
|
|
|
|
|
+ condition += " and Mobile='" + Mobile + "'";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//创客编号
|
|
//创客编号
|
|
@@ -101,7 +98,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//创客真实姓名
|
|
//创客真实姓名
|
|
|
if (!string.IsNullOrEmpty(UserIdRealName))
|
|
if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
{
|
|
{
|
|
|
- condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
|
|
|
|
|
|
|
+ condition += " and UserId in (select Id from Users where RealName='" + UserIdRealName + "')";
|
|
|
}
|
|
}
|
|
|
//支付方式
|
|
//支付方式
|
|
|
if (!string.IsNullOrEmpty(PayModeSelect))
|
|
if (!string.IsNullOrEmpty(PayModeSelect))
|
|
@@ -132,17 +129,17 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//仓库归属创客真实姓名
|
|
//仓库归属创客真实姓名
|
|
|
if (!string.IsNullOrEmpty(StoreUserIdRealName))
|
|
if (!string.IsNullOrEmpty(StoreUserIdRealName))
|
|
|
{
|
|
{
|
|
|
- condition += " and StoreUserId in (select StoreUserId from UserForRealName where RealName='" + StoreUserIdRealName + "')";
|
|
|
|
|
|
|
+ condition += " and StoreUserId in (select Id from Users where RealName='" + StoreUserIdRealName + "')";
|
|
|
}
|
|
}
|
|
|
//快递单号
|
|
//快递单号
|
|
|
if (!string.IsNullOrEmpty(ErpCode))
|
|
if (!string.IsNullOrEmpty(ErpCode))
|
|
|
{
|
|
{
|
|
|
- condition += " and ErpCode=" + ErpCode;
|
|
|
|
|
|
|
+ condition += " and ErpCode='" + ErpCode + "'";
|
|
|
}
|
|
}
|
|
|
//SN
|
|
//SN
|
|
|
if (!string.IsNullOrEmpty(SnNos))
|
|
if (!string.IsNullOrEmpty(SnNos))
|
|
|
{
|
|
{
|
|
|
- condition += " and SnNos=" + SnNos;
|
|
|
|
|
|
|
+ condition += " and SnNos like '%" + SnNos + "%'";
|
|
|
}
|
|
}
|
|
|
//支付时间
|
|
//支付时间
|
|
|
if (!string.IsNullOrEmpty(PayDateData))
|
|
if (!string.IsNullOrEmpty(PayDateData))
|