Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD_WebService
This commit is contained in:
commit
6697ffd39d
2 files changed
+38
-2
No files matched your search
@@ -370,6 +370,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
if (time1 != EncrypUtil.Encryption(time))
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToInt();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToInt();
|
||||||
var erp_order_id_in = RegexUtils.GetStringQuery(ref inputData, "erp_order_id_in")?.Replace("'", "\\'");
|
var erp_order_id_in = RegexUtils.GetStringQuery(ref inputData, "erp_order_id_in")?.Replace("'", "\\'");
|
||||||
if (erp_order_id_in.IsNullOrEmpty())
|
if (erp_order_id_in.IsNullOrEmpty())
|
||||||
{
|
{
|
||||||
@@ -389,6 +391,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
string where = "";
|
string where = "";
|
||||||
if (!string.IsNullOrWhiteSpace(erp_order_id_in))
|
if (!string.IsNullOrWhiteSpace(erp_order_id_in))
|
||||||
where += " and o.order_id in ('" + erp_order_id_in.Replace(",", "','") + "')";
|
where += " and o.order_id in ('" + erp_order_id_in.Replace(",", "','") + "')";
|
||||||
|
if (start_time > 0)
|
||||||
|
where += " and o.update_time >= " + start_time;
|
||||||
|
if (end_time > 0)
|
||||||
|
where += " and o.update_time <= " + end_time;
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -1792,6 +1798,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
}
|
}
|
||||||
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
||||||
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToNullableString();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToNullableString();
|
||||||
|
|
||||||
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
||||||
@@ -1806,6 +1814,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
||||||
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
||||||
|
if (!string.IsNullOrEmpty(start_time))
|
||||||
|
where += " and o.mdy_time >= '" + start_time + "'";
|
||||||
|
if (!string.IsNullOrEmpty(end_time))
|
||||||
|
where += " and o.mdy_time <= '" + end_time + "'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -2036,6 +2048,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
}
|
}
|
||||||
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
||||||
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToNullableString();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToNullableString();
|
||||||
|
|
||||||
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
||||||
@@ -2050,6 +2064,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
||||||
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
||||||
|
if (!string.IsNullOrEmpty(start_time))
|
||||||
|
where += " and o.mdy_time >= '" + start_time + "'";
|
||||||
|
if (!string.IsNullOrEmpty(end_time))
|
||||||
|
where += " and o.mdy_time <= '" + end_time + "'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -2260,6 +2278,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
}
|
}
|
||||||
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
||||||
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToNullableString();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToNullableString();
|
||||||
|
|
||||||
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
||||||
@@ -2274,6 +2294,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
||||||
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
||||||
|
if (!string.IsNullOrEmpty(start_time))
|
||||||
|
where += " and o.mdy_time >= '" + start_time + "'";
|
||||||
|
if (!string.IsNullOrEmpty(end_time))
|
||||||
|
where += " and o.mdy_time <= '" + end_time + "'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -2483,6 +2507,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
}
|
}
|
||||||
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
||||||
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToNullableString();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToNullableString();
|
||||||
|
|
||||||
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
||||||
@@ -2497,6 +2523,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
|
||||||
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
|
||||||
|
if (!string.IsNullOrEmpty(start_time))
|
||||||
|
where += " and o.mdy_time >= '" + start_time + "'";
|
||||||
|
if (!string.IsNullOrEmpty(end_time))
|
||||||
|
where += " and o.mdy_time <= '" + end_time + "'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
@@ -3003,6 +3033,8 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
}
|
}
|
||||||
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
|
||||||
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
|
||||||
|
var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time").ParseToNullableString();
|
||||||
|
var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time").ParseToNullableString();
|
||||||
|
|
||||||
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
|
||||||
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
|
||||||
@@ -3019,6 +3051,10 @@ namespace KJD_Web.BLL.WXXD
|
|||||||
where += " and o.sku_id in ('" + wx_sku_id.Replace(",", "','") + "')";
|
where += " and o.sku_id in ('" + wx_sku_id.Replace(",", "','") + "')";
|
||||||
if (!string.IsNullOrWhiteSpace(out_order_id_in))
|
if (!string.IsNullOrWhiteSpace(out_order_id_in))
|
||||||
where += " and o.out_order_id in ('" + out_order_id_in.Replace(",", "','") + "')";
|
where += " and o.out_order_id in ('" + out_order_id_in.Replace(",", "','") + "')";
|
||||||
|
if (!string.IsNullOrEmpty(start_time))
|
||||||
|
where += " and o.mdy_time >= '" + start_time + "'";
|
||||||
|
if (!string.IsNullOrEmpty(end_time))
|
||||||
|
where += " and o.mdy_time <= '" + end_time + "'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = 0;
|
var count = 0;
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
-->
|
-->
|
||||||
<configuration>
|
<configuration>
|
||||||
<connectionStrings>
|
<connectionStrings>
|
||||||
<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;" />
|
<!--<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;" />-->
|
||||||
<!--<add name="ConnKJD" connectionString="Server=192.168.0.200;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>-->
|
<add name="ConnKJD" connectionString="Server=192.168.0.200;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>
|
||||||
<add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;" />
|
<add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;" />
|
||||||
<add name="UpdateVersion" connectionString="99999" />
|
<add name="UpdateVersion" connectionString="99999" />
|
||||||
<add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update" />
|
<add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update" />
|
||||||
|
|||||||
Reference in new issue
Block a user