1修复sku有特殊字符被截断的bug 2优化店铺进店/登录逻辑
This commit is contained in:
1 parent
91b1ea7dbc
commit
358bb5490e
21 files changed
+304
-171
No files matched your search
@@ -27,7 +27,7 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 752;
|
public static int VersionCount = 755;
|
||||||
//public static int VersionCount = 613;
|
//public static int VersionCount = 613;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -136,6 +136,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetProductList(string inputData, bool isDetail = false)
|
public string GetProductList(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
DateTime timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -166,27 +167,27 @@ namespace KJD_Web.BLL
|
|||||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
MysqlUtils mySql = new MysqlUtils(conn);
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
|
||||||
string sql = "select count(id) from kjd.product p where p.is_del=0";
|
string sql = "SELECT COUNT(id) FROM kjd.product p WHERE p.is_del=0";
|
||||||
if (!isDetail && product_get_type != "all")
|
if (!isDetail && product_get_type != "all")
|
||||||
sql += " and p.product_get_type=" + product_get_type;
|
sql += " AND p.product_get_type=" + product_get_type;
|
||||||
|
|
||||||
string where = "";
|
string where = "";
|
||||||
if (!string.IsNullOrEmpty(search_db_ids))
|
if (!string.IsNullOrEmpty(search_db_ids))
|
||||||
where += " and p.id in (" + search_db_ids + ")";
|
where += " AND p.id in (" + search_db_ids + ")";
|
||||||
if (!string.IsNullOrWhiteSpace(search_group))
|
if (!string.IsNullOrWhiteSpace(search_group))
|
||||||
where += " and p.group = '" + search_group + "'";
|
where += " AND p.group = '" + search_group + "'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_spu))
|
if (!string.IsNullOrWhiteSpace(search_spu))
|
||||||
where += " and p.spu_id like '%" + search_spu + "%'";
|
where += " AND p.spu_id like '%" + search_spu + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_skc))
|
if (!string.IsNullOrWhiteSpace(search_skc))
|
||||||
where += " and p.skc_id like '%" + search_skc + "%'";
|
where += " AND p.skc_id like '%" + search_skc + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_cat))
|
if (!string.IsNullOrWhiteSpace(search_cat))
|
||||||
where += " and p.cat_name like '%" + search_cat + "%'";
|
where += " AND p.cat_name like '%" + search_cat + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_ext_code))
|
if (!string.IsNullOrWhiteSpace(search_ext_code))
|
||||||
where += " and p.ext_code like '%" + search_ext_code + "%'";
|
where += " AND p.ext_code like '%" + search_ext_code + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_prod_name))
|
if (!string.IsNullOrWhiteSpace(search_prod_name))
|
||||||
where += " and p.product_name like '%" + search_prod_name + "%'";
|
where += " AND p.product_name like '%" + search_prod_name + "%'";
|
||||||
if (!string.IsNullOrWhiteSpace(search_notes))
|
if (!string.IsNullOrWhiteSpace(search_notes))
|
||||||
where += " and p.notes like '%" + search_notes + "%'";
|
where += " AND p.notes like '%" + search_notes + "%'";
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = mySql.ExecuteRowCount(sql);
|
var count = mySql.ExecuteRowCount(sql);
|
||||||
@@ -224,7 +225,7 @@ namespace KJD_Web.BLL
|
|||||||
" WHERE p.is_del=0";
|
" WHERE p.is_del=0";
|
||||||
}
|
}
|
||||||
|
|
||||||
//sql += "select * from " + tableName + l_spu_map_table_id + " where draft_id=" + in_draft_id_list[i];
|
//sql += "SELECT * FROM " + tableName + l_spu_map_table_id + " where draft_id=" + in_draft_id_list[i];
|
||||||
|
|
||||||
if (!isDetail && product_get_type != "all") // 详情必须从列表页面进入,不用限制
|
if (!isDetail && product_get_type != "all") // 详情必须从列表页面进入,不用限制
|
||||||
sql += " AND p.product_get_type=" + product_get_type;
|
sql += " AND p.product_get_type=" + product_get_type;
|
||||||
@@ -287,7 +288,8 @@ namespace KJD_Web.BLL
|
|||||||
productLst.Add(prod);
|
productLst.Add(prod);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(productLst);
|
var data = JsonUtils.SerializerObjectToString(productLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -546,7 +548,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
long l_draft_id = draft_id.ParseToLong();
|
long l_draft_id = draft_id.ParseToLong();
|
||||||
@@ -634,6 +636,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetUserSelectProductList(string inputData, bool isAdmin = false)
|
public string GetUserSelectProductList(string inputData, bool isAdmin = false)
|
||||||
{
|
{
|
||||||
|
DateTime timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -845,7 +848,8 @@ namespace KJD_Web.BLL
|
|||||||
productLst.Add(prodSelect);
|
productLst.Add(prodSelect);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(productLst);
|
var data = JsonUtils.SerializerObjectToString(productLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -880,7 +884,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
||||||
@@ -947,9 +951,9 @@ namespace KJD_Web.BLL
|
|||||||
}
|
}
|
||||||
|
|
||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null && db_id_infos == null && db_ids == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
@@ -1074,7 +1078,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
||||||
@@ -1123,6 +1127,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetSelectProdDbIdMapDraftIdList(string inputData, bool isDetail = false)
|
public string GetSelectProdDbIdMapDraftIdList(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
DateTime timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -1146,7 +1151,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
var is_client_jit = RegexUtils.GetStringQuery(ref inputData, "is_client_jit")?.ParseToBool() == true;
|
||||||
@@ -1222,7 +1227,8 @@ namespace KJD_Web.BLL
|
|||||||
dbIdMapProductIdLst.Add(dbIdMapProductId);
|
dbIdMapProductIdLst.Add(dbIdMapProductId);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(dbIdMapProductIdLst);
|
var data = JsonUtils.SerializerObjectToString(dbIdMapProductIdLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -1237,6 +1243,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetSelectProdMapUpSpuIdList(string inputData, bool isDetail = false)
|
public string GetSelectProdMapUpSpuIdList(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
DateTime timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -1311,7 +1318,8 @@ namespace KJD_Web.BLL
|
|||||||
draftIdMapUpSpuIdLst.Add(draftIdMapUpSpuId);
|
draftIdMapUpSpuIdLst.Add(draftIdMapUpSpuId);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(draftIdMapUpSpuIdLst);
|
var data = JsonUtils.SerializerObjectToString(draftIdMapUpSpuIdLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + -1 + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + -1 + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetProductList(string inputData, bool isDetail = false)
|
public string GetProductList(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
var timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -195,7 +196,8 @@ namespace KJD_Web.BLL
|
|||||||
productLst.Add(prod);
|
productLst.Add(prod);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(productLst);
|
var data = JsonUtils.SerializerObjectToString(productLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + seconds + ",\"count\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -408,7 +410,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
long l_draft_id = draft_id.ParseToLong();
|
long l_draft_id = draft_id.ParseToLong();
|
||||||
@@ -479,6 +481,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetUserSelectProductList(string inputData, bool isAdmin = false)
|
public string GetUserSelectProductList(string inputData, bool isAdmin = false)
|
||||||
{
|
{
|
||||||
|
var timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -639,7 +642,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
sql += where; // where子句
|
sql += where; // where子句
|
||||||
|
|
||||||
sql += " order by id desc";
|
sql += " order by add_time desc";
|
||||||
sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
|
sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
|
||||||
dt = mySql.ExecuteDataTable(sql, paramLst.ToArray());
|
dt = mySql.ExecuteDataTable(sql, paramLst.ToArray());
|
||||||
}
|
}
|
||||||
@@ -686,7 +689,8 @@ namespace KJD_Web.BLL
|
|||||||
productLst.Add(prodSelect);
|
productLst.Add(prodSelect);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(productLst);
|
var data = JsonUtils.SerializerObjectToString(productLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -721,7 +725,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string dbName = "kjd";
|
string dbName = "kjd";
|
||||||
@@ -783,9 +787,9 @@ namespace KJD_Web.BLL
|
|||||||
}
|
}
|
||||||
|
|
||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null && db_id_infos == null)
|
if (select_add_time == null && db_id_infos == null && db_ids == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
@@ -911,7 +915,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string dbName = "kjd";
|
string dbName = "kjd";
|
||||||
@@ -955,6 +959,7 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
public string GetSelectProdDbIdMapDraftIdList(string inputData, bool isDetail = false)
|
public string GetSelectProdDbIdMapDraftIdList(string inputData, bool isDetail = false)
|
||||||
{
|
{
|
||||||
|
var timeCalc = DateTime.Now;
|
||||||
if (!string.IsNullOrEmpty(inputData))
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
{
|
{
|
||||||
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
|
||||||
@@ -978,7 +983,7 @@ namespace KJD_Web.BLL
|
|||||||
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
var select_add_time = RegexUtils.GetStringQuery(ref inputData, "select_add_time")?.Replace("'", "\\'").ParseToDateTimeNullable();
|
||||||
if (select_add_time == null)
|
if (select_add_time == null)
|
||||||
{
|
{
|
||||||
//return "{\"code\":500,\"msg\":\"旧查询接口已失效,请升级软件。\"}";
|
return "{\"code\":500,\"msg\":\"当前软件版本不支持该操作,请升级软件。\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
string dbName = "kjd_map";
|
string dbName = "kjd_map";
|
||||||
@@ -1051,7 +1056,8 @@ namespace KJD_Web.BLL
|
|||||||
dbIdMapProductIdLst.Add(dbIdMapProductId);
|
dbIdMapProductIdLst.Add(dbIdMapProductId);
|
||||||
}
|
}
|
||||||
var data = JsonUtils.SerializerObjectToString(dbIdMapProductIdLst);
|
var data = JsonUtils.SerializerObjectToString(dbIdMapProductIdLst);
|
||||||
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
|
var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
||||||
<ProjectView>ShowAllFiles</ProjectView>
|
<ProjectView>ShowAllFiles</ProjectView>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
|||||||
@@ -160,8 +160,6 @@ namespace TemuKJD.BLL
|
|||||||
+ "&shop_user_name=" + _shop.UserName;
|
+ "&shop_user_name=" + _shop.UserName;
|
||||||
|
|
||||||
var result = GetHtml.PostUtf8(url, data);
|
var result = GetHtml.PostUtf8(url, data);
|
||||||
if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在"))
|
|
||||||
result = GetHtml.PostUtf8(url, data);
|
|
||||||
if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在"))
|
if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在"))
|
||||||
result = GetHtml.PostUtf8(url, data);
|
result = GetHtml.PostUtf8(url, data);
|
||||||
if (!result.Contains("\"code\":200"))
|
if (!result.Contains("\"code\":200"))
|
||||||
|
|||||||
+41
-40
@@ -64,9 +64,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.btnRemainOK = new DevComponents.DotNetBar.PanelEx();
|
this.btnRemainOK = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.lblAddProdRemaining = new System.Windows.Forms.Label();
|
this.lblAddProdRemaining = new System.Windows.Forms.Label();
|
||||||
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
|
||||||
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
|
|
||||||
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
|
||||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
|
||||||
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
|
||||||
this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
@@ -97,6 +94,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.colSubSa = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
this.colSubSa = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
||||||
this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
|
this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||||
this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn();
|
||||||
|
this.chkAutoDrag = new System.Windows.Forms.CheckBox();
|
||||||
|
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
|
||||||
|
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||||
this.splitContainer1.Panel1.SuspendLayout();
|
this.splitContainer1.Panel1.SuspendLayout();
|
||||||
this.splitContainer1.Panel2.SuspendLayout();
|
this.splitContainer1.Panel2.SuspendLayout();
|
||||||
@@ -565,43 +565,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
|
||||||
this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown);
|
this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown);
|
||||||
//
|
//
|
||||||
// chkAutoDrag
|
|
||||||
//
|
|
||||||
this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right;
|
|
||||||
this.chkAutoDrag.AutoSize = true;
|
|
||||||
this.chkAutoDrag.BackColor = System.Drawing.Color.White;
|
|
||||||
this.chkAutoDrag.Location = new System.Drawing.Point(597, 0);
|
|
||||||
this.chkAutoDrag.Name = "chkAutoDrag";
|
|
||||||
this.chkAutoDrag.Size = new System.Drawing.Size(159, 21);
|
|
||||||
this.chkAutoDrag.TabIndex = 3;
|
|
||||||
this.chkAutoDrag.Text = "登录时自动滑动拼图验证";
|
|
||||||
this.chkAutoDrag.UseVisualStyleBackColor = false;
|
|
||||||
this.chkAutoDrag.Visible = false;
|
|
||||||
//
|
|
||||||
// ucSplitPage1
|
|
||||||
//
|
|
||||||
this.ucSplitPage1.CurrentPage = 1;
|
|
||||||
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
|
||||||
this.ucSplitPage1.IsShowPageSize = false;
|
|
||||||
this.ucSplitPage1.Location = new System.Drawing.Point(911, 0);
|
|
||||||
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
|
||||||
this.ucSplitPage1.Name = "ucSplitPage1";
|
|
||||||
this.ucSplitPage1.PageSize = 50;
|
|
||||||
this.ucSplitPage1.Size = new System.Drawing.Size(362, 25);
|
|
||||||
this.ucSplitPage1.TabIndex = 4;
|
|
||||||
this.ucSplitPage1.TotalPage = 1;
|
|
||||||
//
|
|
||||||
// statusBar
|
|
||||||
//
|
|
||||||
this.statusBar.BackColor = System.Drawing.Color.White;
|
|
||||||
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
||||||
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
||||||
this.statusBar.Location = new System.Drawing.Point(0, 0);
|
|
||||||
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
|
||||||
this.statusBar.Name = "statusBar";
|
|
||||||
this.statusBar.Size = new System.Drawing.Size(1273, 25);
|
|
||||||
this.statusBar.TabIndex = 1;
|
|
||||||
//
|
|
||||||
// colSelect
|
// colSelect
|
||||||
//
|
//
|
||||||
this.colSelect.FillWeight = 26F;
|
this.colSelect.FillWeight = 26F;
|
||||||
@@ -852,6 +815,44 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.colDelete.ReadOnly = true;
|
this.colDelete.ReadOnly = true;
|
||||||
this.colDelete.Visible = false;
|
this.colDelete.Visible = false;
|
||||||
//
|
//
|
||||||
|
// chkAutoDrag
|
||||||
|
//
|
||||||
|
this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right;
|
||||||
|
this.chkAutoDrag.AutoSize = true;
|
||||||
|
this.chkAutoDrag.BackColor = System.Drawing.Color.White;
|
||||||
|
this.chkAutoDrag.Location = new System.Drawing.Point(597, 0);
|
||||||
|
this.chkAutoDrag.Name = "chkAutoDrag";
|
||||||
|
this.chkAutoDrag.Size = new System.Drawing.Size(159, 21);
|
||||||
|
this.chkAutoDrag.TabIndex = 3;
|
||||||
|
this.chkAutoDrag.Text = "登录时自动滑动拼图验证";
|
||||||
|
this.chkAutoDrag.UseVisualStyleBackColor = false;
|
||||||
|
this.chkAutoDrag.Visible = false;
|
||||||
|
//
|
||||||
|
// ucSplitPage1
|
||||||
|
//
|
||||||
|
this.ucSplitPage1.CurrentPage = 1;
|
||||||
|
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
|
||||||
|
this.ucSplitPage1.IsShowPageSize = true;
|
||||||
|
this.ucSplitPage1.Location = new System.Drawing.Point(831, 0);
|
||||||
|
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
|
||||||
|
this.ucSplitPage1.Name = "ucSplitPage1";
|
||||||
|
this.ucSplitPage1.PageSize = 50;
|
||||||
|
this.ucSplitPage1.Size = new System.Drawing.Size(442, 25);
|
||||||
|
this.ucSplitPage1.TabIndex = 4;
|
||||||
|
this.ucSplitPage1.TotalPage = 1;
|
||||||
|
this.ucSplitPage1.Load += new System.EventHandler(this.ucSplitPage1_Load);
|
||||||
|
//
|
||||||
|
// statusBar
|
||||||
|
//
|
||||||
|
this.statusBar.BackColor = System.Drawing.Color.White;
|
||||||
|
this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.statusBar.Location = new System.Drawing.Point(0, 0);
|
||||||
|
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
|
||||||
|
this.statusBar.Name = "statusBar";
|
||||||
|
this.statusBar.Size = new System.Drawing.Size(1273, 25);
|
||||||
|
this.statusBar.TabIndex = 1;
|
||||||
|
//
|
||||||
// AdminShopListForm
|
// AdminShopListForm
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ using TemuKJD.Extension;
|
|||||||
using TemuKJD.BaseForms;
|
using TemuKJD.BaseForms;
|
||||||
using TemuKJD.KJDForms.ShopForms;
|
using TemuKJD.KJDForms.ShopForms;
|
||||||
using Work;
|
using Work;
|
||||||
|
using NaiBa.Util;
|
||||||
|
|
||||||
namespace TemuKJD.KJDForms.AdminForms
|
namespace TemuKJD.KJDForms.AdminForms
|
||||||
{
|
{
|
||||||
@@ -32,7 +33,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
set { inst = value; }
|
set { inst = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ShopLoginInfo> lstAdminShopInfo { get; set; } = new List<ShopLoginInfo>();
|
public static ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||||
|
|
||||||
public AdminShopListForm()
|
public AdminShopListForm()
|
||||||
{
|
{
|
||||||
@@ -101,7 +102,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
Task.Run(() =>
|
Task.Run(() =>
|
||||||
{
|
{
|
||||||
int pageCount;
|
int pageCount;
|
||||||
var list = AdminGetServerShopLst(out pageCount, page);
|
var list = AdminGetServerShopLst(out pageCount, page, ucSplitPage1.PageSize) ;
|
||||||
lstAdminShopInfo.AddRange(list);
|
lstAdminShopInfo.AddRange(list);
|
||||||
this.ucSplitPage1.TotalPage = pageCount;
|
this.ucSplitPage1.TotalPage = pageCount;
|
||||||
|
|
||||||
@@ -299,8 +300,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
case "编辑":
|
case "编辑":
|
||||||
{
|
{
|
||||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||||
editForm.txtNotes.ReadOnly = true;
|
editForm.lblNotes.Visible = false;
|
||||||
editForm.txtNotes.Enabled = false;
|
editForm.txtNotes.Visible = false;
|
||||||
editForm.SaveCompleteWithDescribe += EditForm_SaveCompleteWithDescribe;
|
editForm.SaveCompleteWithDescribe += EditForm_SaveCompleteWithDescribe;
|
||||||
editForm.ShowDialog();
|
editForm.ShowDialog();
|
||||||
}
|
}
|
||||||
@@ -308,10 +309,20 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
case "编辑备注":
|
case "编辑备注":
|
||||||
{
|
{
|
||||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||||
editForm.txtChatAccount.ReadOnly = true;
|
|
||||||
editForm.txtChatAccount.Enabled = false;
|
|
||||||
editForm.txtShopPassword.ReadOnly = true;
|
editForm.txtShopPassword.ReadOnly = true;
|
||||||
editForm.txtShopPassword.Enabled = false;
|
editForm.txtShopPassword.Enabled = false;
|
||||||
|
editForm.txtShopPassword.Visible = false;
|
||||||
|
editForm.lblShopPassword.Visible = false;
|
||||||
|
|
||||||
|
editForm.txtChatAccount.ReadOnly = true;
|
||||||
|
editForm.txtChatAccount.Enabled = false;
|
||||||
|
editForm.txtChatAccount.Visible = false;
|
||||||
|
editForm.lblChatAccount.Visible = false;
|
||||||
|
|
||||||
|
editForm.lblNotes.Location = editForm.lblShopPassword.Location;
|
||||||
|
editForm.txtNotes.Location = editForm.txtShopPassword.Location;
|
||||||
|
|
||||||
editForm.ShowDialog();
|
editForm.ShowDialog();
|
||||||
if (editForm.HasChange)
|
if (editForm.HasChange)
|
||||||
{
|
{
|
||||||
@@ -1020,5 +1031,10 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
{
|
{
|
||||||
this.pnlAddProdRemaining.Visible = false;
|
this.pnlAddProdRemaining.Visible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ucSplitPage1_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -561,17 +561,41 @@ namespace TemuKJD.KJDForms.ProductForms
|
|||||||
case "状态":
|
case "状态":
|
||||||
if (IsAdmin)
|
if (IsAdmin)
|
||||||
{
|
{
|
||||||
AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop);
|
AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||||
shopLoginForm.openType = EnumOpenType.login;
|
if (shop.LoginStatus2 == "国际版在线")
|
||||||
shopLoginForm.SaveComplete += shopLoginForm_SaveComplete;
|
{
|
||||||
shopLoginForm.ShowDialog();
|
AdminShopLoginForm adminLoginForm = new AdminShopLoginForm(shop);
|
||||||
|
adminLoginForm.openType = EnumOpenType.manage;
|
||||||
|
adminLoginForm.WindowState = FormWindowState.Maximized;
|
||||||
|
adminLoginForm.InitUrl = "https://agentseller.temu.com";
|
||||||
|
adminLoginForm.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
AdminShopLoginForm shopLoginForm = new AdminShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.login;
|
||||||
|
shopLoginForm.SaveComplete += shopLoginForm_SaveComplete;
|
||||||
|
shopLoginForm.ShowDialog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||||
shopLoginForm.openType = EnumOpenType.login;
|
if (shop.LoginStatus2 == "国际版在线")
|
||||||
shopLoginForm.SaveComplete += shopLoginForm_SaveComplete;
|
{
|
||||||
shopLoginForm.ShowDialog();
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.manage;
|
||||||
|
shopLoginForm.WindowState = FormWindowState.Maximized;
|
||||||
|
shopLoginForm.InitUrl = "https://agentseller.temu.com";
|
||||||
|
shopLoginForm.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.login;
|
||||||
|
shopLoginForm.ShowDialog();
|
||||||
|
RefreshShop();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -198,10 +198,24 @@ namespace TemuKJD.KJDForms.ProductForms
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "colLoginStatus":
|
case "colLoginStatus":
|
||||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
{
|
||||||
shopLoginForm.openType = EnumOpenType.login;
|
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||||
shopLoginForm.ShowDialog();
|
if (shop.LoginStatus2 == "国际版在线")
|
||||||
RefreshShop();
|
{
|
||||||
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.manage;
|
||||||
|
shopLoginForm.WindowState = FormWindowState.Maximized;
|
||||||
|
shopLoginForm.InitUrl = "https://agentseller.temu.com";
|
||||||
|
shopLoginForm.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.login;
|
||||||
|
shopLoginForm.ShowDialog();
|
||||||
|
RefreshShop();
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -594,10 +594,22 @@ namespace TemuKJD.KJDForms.ProductForms
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "colLoginStatus":
|
case "colLoginStatus":
|
||||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||||
shopLoginForm.openType = EnumOpenType.login;
|
if (shop.LoginStatus2 == "国际版在线")
|
||||||
shopLoginForm.ShowDialog();
|
{
|
||||||
RefreshShop();
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.manage;
|
||||||
|
shopLoginForm.WindowState = FormWindowState.Maximized;
|
||||||
|
shopLoginForm.InitUrl = "https://agentseller.temu.com";
|
||||||
|
shopLoginForm.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.login;
|
||||||
|
shopLoginForm.ShowDialog();
|
||||||
|
RefreshShop();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,11 +214,22 @@ namespace TemuKJD.KJDForms.ProductForms
|
|||||||
break;
|
break;
|
||||||
case "colLoginStatus":
|
case "colLoginStatus":
|
||||||
{
|
{
|
||||||
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
|
||||||
shopLoginForm.openType = EnumOpenType.login;
|
if (shop.LoginStatus2 == "国际版在线")
|
||||||
//shopLoginForm.IsAdsLogin = true;
|
{
|
||||||
shopLoginForm.ShowDialog();
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
RefreshShop();
|
shopLoginForm.openType = EnumOpenType.manage;
|
||||||
|
shopLoginForm.WindowState = FormWindowState.Maximized;
|
||||||
|
shopLoginForm.InitUrl = "https://agentseller.temu.com";
|
||||||
|
shopLoginForm.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ShopLoginForm shopLoginForm = new ShopLoginForm(shop);
|
||||||
|
shopLoginForm.openType = EnumOpenType.login;
|
||||||
|
shopLoginForm.ShowDialog();
|
||||||
|
RefreshShop();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "colAdsLoginStatus":
|
case "colAdsLoginStatus":
|
||||||
|
|||||||
@@ -289,7 +289,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
data += "&get_select_count=true";
|
data += "&get_select_count=true";
|
||||||
data += "&select_shop_id=" + shop.ShopId;
|
data += "&select_shop_id=" + shop.ShopId;
|
||||||
}
|
}
|
||||||
else if (BaseClass.SaLevel > 0) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
|
else if (BaseClass.SaLevel > 0 || IsClientJit) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
|
||||||
{
|
{
|
||||||
data += "&product_get_type=all";
|
data += "&product_get_type=all";
|
||||||
}
|
}
|
||||||
@@ -517,8 +517,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
if (IsClientJit)
|
if (IsClientJit)
|
||||||
data += "&is_client_jit=true";
|
data += "&is_client_jit=true";
|
||||||
var html = GetHtml.PostUtf8(url, data);
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
|
||||||
html = GetHtml.PostUtf8(url, data);
|
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
html = GetHtml.PostUtf8(url, data);
|
html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
|||||||
@@ -292,7 +292,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
Task.Run(() =>
|
Task.Run(() =>
|
||||||
{
|
{
|
||||||
int pageCount;
|
int pageCount;
|
||||||
var list = GetSelectProductList(out pageCount, page, ucSplitPage1.PageSize);
|
decimal seconds;
|
||||||
|
var list = GetSelectProductList(out pageCount, out seconds, page, ucSplitPage1.PageSize);
|
||||||
lstAdminTemuDBProductSelect.AddRange(list);
|
lstAdminTemuDBProductSelect.AddRange(list);
|
||||||
this.ucSplitPage1.TotalPage = pageCount;
|
this.ucSplitPage1.TotalPage = pageCount;
|
||||||
|
|
||||||
@@ -357,6 +358,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
this.pbLoading.Visible = false;
|
this.pbLoading.Visible = false;
|
||||||
|
if(ClientMode == EnumClientMode.ClientJit)
|
||||||
|
this.statusBar.lblTaskStatus.Text = "JIT上传查询完毕";
|
||||||
|
else
|
||||||
|
this.statusBar.lblTaskStatus.Text = "认领上传查询完毕";
|
||||||
|
#if DEBUG
|
||||||
|
this.statusBar.lblTaskStatus.Text += ",耗时:" + seconds;
|
||||||
|
#endif
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -365,10 +373,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, int page = 1, int pageSize = 50)
|
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 50)
|
||||||
{
|
{
|
||||||
List<TemuDBProductSelect> list = new List<TemuDBProductSelect>();
|
List<TemuDBProductSelect> list = new List<TemuDBProductSelect>();
|
||||||
pageCount = 1;
|
pageCount = 1;
|
||||||
|
seconds = 0;
|
||||||
|
|
||||||
var url = BaseClass.BuildObjString("product/admin_get_user_select_product_list");
|
var url = BaseClass.BuildObjString("product/admin_get_user_select_product_list");
|
||||||
if (ClientMode != EnumClientMode.Admin)
|
if (ClientMode != EnumClientMode.Admin)
|
||||||
@@ -416,6 +425,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
return new List<TemuDBProductSelect>();
|
return new List<TemuDBProductSelect>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||||
int count = BaseRegex.GetIntJson(ref html, "count");
|
int count = BaseRegex.GetIntJson(ref html, "count");
|
||||||
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||||
pageCount = Math.Max(pageCount, 1);
|
pageCount = Math.Max(pageCount, 1);
|
||||||
@@ -1025,8 +1035,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
|||||||
}
|
}
|
||||||
|
|
||||||
var html = GetHtml.PostUtf8(url, data);
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
|
||||||
html = GetHtml.PostUtf8(url, data);
|
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
html = GetHtml.PostUtf8(url, data);
|
html = GetHtml.PostUtf8(url, data);
|
||||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
|||||||
@@ -168,7 +168,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
Task.Run(() =>
|
Task.Run(() =>
|
||||||
{
|
{
|
||||||
int pageCount;
|
int pageCount;
|
||||||
var list = GetSelectProductList(out pageCount, page, ucSplitPage1.PageSize);
|
decimal seconds;
|
||||||
|
var list = GetSelectProductList(out pageCount, out seconds, page, ucSplitPage1.PageSize);
|
||||||
lstAdminTemuDBProductSelect.AddRange(list);
|
lstAdminTemuDBProductSelect.AddRange(list);
|
||||||
this.ucSplitPage1.TotalPage = pageCount;
|
this.ucSplitPage1.TotalPage = pageCount;
|
||||||
|
|
||||||
@@ -225,6 +226,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
{
|
{
|
||||||
ShowDgvImg();
|
ShowDgvImg();
|
||||||
this.pbLoading.Visible = false;
|
this.pbLoading.Visible = false;
|
||||||
|
this.statusBar.lblTaskStatus.Text = "库存上传查询完毕";
|
||||||
|
#if DEBUG
|
||||||
|
this.statusBar.lblTaskStatus.Text += ",耗时:" + seconds;
|
||||||
|
#endif
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -283,10 +288,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, int page = 1, int pageSize = 50)
|
public List<TemuDBProductSelect> GetSelectProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 50)
|
||||||
{
|
{
|
||||||
List<TemuDBProductSelect> list = new List<TemuDBProductSelect>();
|
List<TemuDBProductSelect> list = new List<TemuDBProductSelect>();
|
||||||
pageCount = 1;
|
pageCount = 1;
|
||||||
|
seconds = 0;
|
||||||
|
|
||||||
var url = BaseClass.BuildObjString("product_third/admin_get_user_select_product_list");
|
var url = BaseClass.BuildObjString("product_third/admin_get_user_select_product_list");
|
||||||
if (ClientMode != EnumClientMode.Admin)
|
if (ClientMode != EnumClientMode.Admin)
|
||||||
@@ -332,6 +338,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
|
|||||||
return new List<TemuDBProductSelect>();
|
return new List<TemuDBProductSelect>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
|
||||||
int count = BaseRegex.GetIntJson(ref html, "count");
|
int count = BaseRegex.GetIntJson(ref html, "count");
|
||||||
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
|
||||||
pageCount = Math.Max(pageCount, 1);
|
pageCount = Math.Max(pageCount, 1);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="shop"></param>
|
/// <param name="shop"></param>
|
||||||
/// <param name="isBack">后台静默执行</param>
|
/// <param name="isBack">后台静默执行</param>
|
||||||
public bool GetReturnPackage(ShopLoginInfo shop, bool isBack = false)
|
public bool GetReturnPackage(ShopLoginInfo shop, bool isBack = false, DateTime? backStartTime = null, DateTime? backEndTime = null)
|
||||||
{
|
{
|
||||||
bool isError = false;
|
bool isError = false;
|
||||||
|
|
||||||
@@ -82,8 +82,12 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
if (isBack)
|
if (isBack)
|
||||||
{
|
{
|
||||||
endTime = this.dtpEndDate.Value.Date.AddDays(1);
|
endTime = this.dtpEndDate.Value.Date.AddDays(1);
|
||||||
startTime = endTime.AddMonths(-1);
|
//startTime = endTime.AddMonths(-1);
|
||||||
startTime = endTime.AddDays(-20);
|
startTime = endTime.AddDays(-20);
|
||||||
|
if (backEndTime != null)
|
||||||
|
backEndTime = backEndTime.Value;
|
||||||
|
if (backStartTime != null)
|
||||||
|
startTime = backStartTime.Value;
|
||||||
}
|
}
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
var t = Task.Run(() =>
|
var t = Task.Run(() =>
|
||||||
|
|||||||
+34
-34
@@ -30,18 +30,18 @@
|
|||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopAddEditForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopAddEditForm));
|
||||||
this.panel2 = new System.Windows.Forms.Panel();
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
this.label8 = new System.Windows.Forms.Label();
|
this.lblNotes = new System.Windows.Forms.Label();
|
||||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.label7 = new System.Windows.Forms.Label();
|
this.label7 = new System.Windows.Forms.Label();
|
||||||
this.cmbGroup = new System.Windows.Forms.ComboBox();
|
this.cmbGroup = new System.Windows.Forms.ComboBox();
|
||||||
this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtBuyAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.label6 = new System.Windows.Forms.Label();
|
this.label6 = new System.Windows.Forms.Label();
|
||||||
this.txtChatAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtChatAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.label4 = new System.Windows.Forms.Label();
|
this.lblChatAccount = new System.Windows.Forms.Label();
|
||||||
this.txtUploadAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtUploadAccount = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.label3 = new System.Windows.Forms.Label();
|
this.label3 = new System.Windows.Forms.Label();
|
||||||
this.txtShopPassword = new System.Windows.Forms.TextBox();
|
this.txtShopPassword = new System.Windows.Forms.TextBox();
|
||||||
this.label2 = new System.Windows.Forms.Label();
|
this.lblShopPassword = new System.Windows.Forms.Label();
|
||||||
this.txtLoginName = new System.Windows.Forms.TextBox();
|
this.txtLoginName = new System.Windows.Forms.TextBox();
|
||||||
this.label1 = new System.Windows.Forms.Label();
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
this.label5 = new System.Windows.Forms.Label();
|
this.label5 = new System.Windows.Forms.Label();
|
||||||
@@ -52,18 +52,18 @@
|
|||||||
// panel2
|
// panel2
|
||||||
//
|
//
|
||||||
this.panel2.BackColor = System.Drawing.Color.White;
|
this.panel2.BackColor = System.Drawing.Color.White;
|
||||||
this.panel2.Controls.Add(this.label8);
|
this.panel2.Controls.Add(this.lblNotes);
|
||||||
this.panel2.Controls.Add(this.txtNotes);
|
this.panel2.Controls.Add(this.txtNotes);
|
||||||
this.panel2.Controls.Add(this.label7);
|
this.panel2.Controls.Add(this.label7);
|
||||||
this.panel2.Controls.Add(this.cmbGroup);
|
this.panel2.Controls.Add(this.cmbGroup);
|
||||||
this.panel2.Controls.Add(this.txtBuyAccount);
|
this.panel2.Controls.Add(this.txtBuyAccount);
|
||||||
this.panel2.Controls.Add(this.label6);
|
this.panel2.Controls.Add(this.label6);
|
||||||
this.panel2.Controls.Add(this.txtChatAccount);
|
this.panel2.Controls.Add(this.txtChatAccount);
|
||||||
this.panel2.Controls.Add(this.label4);
|
this.panel2.Controls.Add(this.lblChatAccount);
|
||||||
this.panel2.Controls.Add(this.txtUploadAccount);
|
this.panel2.Controls.Add(this.txtUploadAccount);
|
||||||
this.panel2.Controls.Add(this.label3);
|
this.panel2.Controls.Add(this.label3);
|
||||||
this.panel2.Controls.Add(this.txtShopPassword);
|
this.panel2.Controls.Add(this.txtShopPassword);
|
||||||
this.panel2.Controls.Add(this.label2);
|
this.panel2.Controls.Add(this.lblShopPassword);
|
||||||
this.panel2.Controls.Add(this.txtLoginName);
|
this.panel2.Controls.Add(this.txtLoginName);
|
||||||
this.panel2.Controls.Add(this.label1);
|
this.panel2.Controls.Add(this.label1);
|
||||||
this.panel2.Controls.Add(this.label5);
|
this.panel2.Controls.Add(this.label5);
|
||||||
@@ -71,18 +71,18 @@
|
|||||||
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
this.panel2.Location = new System.Drawing.Point(1, 33);
|
this.panel2.Location = new System.Drawing.Point(1, 33);
|
||||||
this.panel2.Name = "panel2";
|
this.panel2.Name = "panel2";
|
||||||
this.panel2.Size = new System.Drawing.Size(295, 285);
|
this.panel2.Size = new System.Drawing.Size(295, 276);
|
||||||
this.panel2.TabIndex = 1;
|
this.panel2.TabIndex = 1;
|
||||||
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
|
this.panel2.Paint += new System.Windows.Forms.PaintEventHandler(this.panel2_Paint);
|
||||||
//
|
//
|
||||||
// label8
|
// lblNotes
|
||||||
//
|
//
|
||||||
this.label8.AutoSize = true;
|
this.lblNotes.AutoSize = true;
|
||||||
this.label8.Location = new System.Drawing.Point(29, 135);
|
this.lblNotes.Location = new System.Drawing.Point(29, 136);
|
||||||
this.label8.Name = "label8";
|
this.lblNotes.Name = "lblNotes";
|
||||||
this.label8.Size = new System.Drawing.Size(56, 17);
|
this.lblNotes.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label8.TabIndex = 386;
|
this.lblNotes.TabIndex = 386;
|
||||||
this.label8.Text = " 备注";
|
this.lblNotes.Text = " 备注";
|
||||||
//
|
//
|
||||||
// txtNotes
|
// txtNotes
|
||||||
//
|
//
|
||||||
@@ -124,7 +124,7 @@
|
|||||||
"上货",
|
"上货",
|
||||||
"数据",
|
"数据",
|
||||||
"登录"});
|
"登录"});
|
||||||
this.cmbGroup.Location = new System.Drawing.Point(91, 257);
|
this.cmbGroup.Location = new System.Drawing.Point(91, 253);
|
||||||
this.cmbGroup.Name = "cmbGroup";
|
this.cmbGroup.Name = "cmbGroup";
|
||||||
this.cmbGroup.Size = new System.Drawing.Size(172, 25);
|
this.cmbGroup.Size = new System.Drawing.Size(172, 25);
|
||||||
this.cmbGroup.TabIndex = 383;
|
this.cmbGroup.TabIndex = 383;
|
||||||
@@ -183,14 +183,14 @@
|
|||||||
this.txtChatAccount.Click += new System.EventHandler(this.txt_Click);
|
this.txtChatAccount.Click += new System.EventHandler(this.txt_Click);
|
||||||
this.txtChatAccount.TextChanged += new System.EventHandler(this.txtChat_TextChanged);
|
this.txtChatAccount.TextChanged += new System.EventHandler(this.txtChat_TextChanged);
|
||||||
//
|
//
|
||||||
// label4
|
// lblChatAccount
|
||||||
//
|
//
|
||||||
this.label4.AutoSize = true;
|
this.lblChatAccount.AutoSize = true;
|
||||||
this.label4.Location = new System.Drawing.Point(29, 102);
|
this.lblChatAccount.Location = new System.Drawing.Point(29, 102);
|
||||||
this.label4.Name = "label4";
|
this.lblChatAccount.Name = "lblChatAccount";
|
||||||
this.label4.Size = new System.Drawing.Size(56, 17);
|
this.lblChatAccount.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label4.TabIndex = 379;
|
this.lblChatAccount.TabIndex = 379;
|
||||||
this.label4.Text = " 子账户";
|
this.lblChatAccount.Text = " 子账户";
|
||||||
//
|
//
|
||||||
// txtUploadAccount
|
// txtUploadAccount
|
||||||
//
|
//
|
||||||
@@ -229,14 +229,14 @@
|
|||||||
this.txtShopPassword.Size = new System.Drawing.Size(172, 23);
|
this.txtShopPassword.Size = new System.Drawing.Size(172, 23);
|
||||||
this.txtShopPassword.TabIndex = 338;
|
this.txtShopPassword.TabIndex = 338;
|
||||||
//
|
//
|
||||||
// label2
|
// lblShopPassword
|
||||||
//
|
//
|
||||||
this.label2.AutoSize = true;
|
this.lblShopPassword.AutoSize = true;
|
||||||
this.label2.Location = new System.Drawing.Point(29, 67);
|
this.lblShopPassword.Location = new System.Drawing.Point(29, 67);
|
||||||
this.label2.Name = "label2";
|
this.lblShopPassword.Name = "lblShopPassword";
|
||||||
this.label2.Size = new System.Drawing.Size(56, 17);
|
this.lblShopPassword.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label2.TabIndex = 337;
|
this.lblShopPassword.TabIndex = 337;
|
||||||
this.label2.Text = "登录密码";
|
this.lblShopPassword.Text = "登录密码";
|
||||||
//
|
//
|
||||||
// txtLoginName
|
// txtLoginName
|
||||||
//
|
//
|
||||||
@@ -257,7 +257,7 @@
|
|||||||
// label5
|
// label5
|
||||||
//
|
//
|
||||||
this.label5.AutoSize = true;
|
this.label5.AutoSize = true;
|
||||||
this.label5.Location = new System.Drawing.Point(29, 260);
|
this.label5.Location = new System.Drawing.Point(29, 256);
|
||||||
this.label5.Name = "label5";
|
this.label5.Name = "label5";
|
||||||
this.label5.Size = new System.Drawing.Size(56, 17);
|
this.label5.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label5.TabIndex = 377;
|
this.label5.TabIndex = 377;
|
||||||
@@ -283,7 +283,7 @@
|
|||||||
// ShopAddEditForm
|
// ShopAddEditForm
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
this.ClientSize = new System.Drawing.Size(297, 319);
|
this.ClientSize = new System.Drawing.Size(297, 310);
|
||||||
this.Controls.Add(this.panel2);
|
this.Controls.Add(this.panel2);
|
||||||
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
@@ -302,7 +302,6 @@
|
|||||||
|
|
||||||
private System.Windows.Forms.Panel panel2;
|
private System.Windows.Forms.Panel panel2;
|
||||||
private System.Windows.Forms.Label label1;
|
private System.Windows.Forms.Label label1;
|
||||||
private System.Windows.Forms.Label label2;
|
|
||||||
private System.Windows.Forms.TextBox txtLoginName;
|
private System.Windows.Forms.TextBox txtLoginName;
|
||||||
private UserControls.ButtonEx btnOk;
|
private UserControls.ButtonEx btnOk;
|
||||||
private System.Windows.Forms.Label label5;
|
private System.Windows.Forms.Label label5;
|
||||||
@@ -310,12 +309,13 @@
|
|||||||
private System.Windows.Forms.Label label3;
|
private System.Windows.Forms.Label label3;
|
||||||
private DevComponents.DotNetBar.Controls.TextBoxX txtBuyAccount;
|
private DevComponents.DotNetBar.Controls.TextBoxX txtBuyAccount;
|
||||||
private System.Windows.Forms.Label label6;
|
private System.Windows.Forms.Label label6;
|
||||||
private System.Windows.Forms.Label label4;
|
|
||||||
private System.Windows.Forms.ComboBox cmbGroup;
|
private System.Windows.Forms.ComboBox cmbGroup;
|
||||||
private System.Windows.Forms.Label label7;
|
private System.Windows.Forms.Label label7;
|
||||||
private System.Windows.Forms.Label label8;
|
|
||||||
public System.Windows.Forms.TextBox txtShopPassword;
|
public System.Windows.Forms.TextBox txtShopPassword;
|
||||||
public DevComponents.DotNetBar.Controls.TextBoxX txtChatAccount;
|
public DevComponents.DotNetBar.Controls.TextBoxX txtChatAccount;
|
||||||
public DevComponents.DotNetBar.Controls.TextBoxX txtNotes;
|
public DevComponents.DotNetBar.Controls.TextBoxX txtNotes;
|
||||||
|
public System.Windows.Forms.Label lblNotes;
|
||||||
|
public System.Windows.Forms.Label lblChatAccount;
|
||||||
|
public System.Windows.Forms.Label lblShopPassword;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,8 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
public static void UpdateShop()
|
public static void UpdateShop()
|
||||||
{
|
{
|
||||||
// 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中(不保存敏感信息)。
|
// 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中(不保存敏感信息)。
|
||||||
GlobalConfig.ShopLoginList = new ConcurrentList<ShopLoginInfo>();
|
//GlobalConfig.ShopLoginList = new ConcurrentList<ShopLoginInfo>();
|
||||||
|
GlobalConfig.ShopLoginList.Clear();
|
||||||
// 获取服务端店铺
|
// 获取服务端店铺
|
||||||
var serverShopList = ShopListForm.GetServerShop();
|
var serverShopList = ShopListForm.GetServerShop();
|
||||||
//var localShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<ShopLoginInfo>>("dou_shop_login");
|
//var localShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<ShopLoginInfo>>("dou_shop_login");
|
||||||
@@ -99,8 +100,6 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
GlobalConfig.ShopLoginList.Add(localShop);
|
GlobalConfig.ShopLoginList.Add(localShop);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList<ShopLoginInfo>();
|
|
||||||
GlobalConfig.DouShopLoginOtherUserShopList.AddRange(localShopList.Where(l => !GlobalConfig.ShopLoginList.Any(s => s.LoginName == l.LoginName)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ShopLoginInfo> GetServerShop()
|
public static List<ShopLoginInfo> GetServerShop()
|
||||||
@@ -612,7 +611,7 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
|
|
||||||
// 先从服务端取最新cookie
|
// 先从服务端取最新cookie
|
||||||
var serverCampanys = ShopBLL.AdminGetServerShopLstByIds(campanys.Select(c => c.ShopId).ToList());
|
var serverCampanys = ShopBLL.AdminGetServerShopLstByIds(campanys.Select(c => c.ShopId).ToList());
|
||||||
var sss = string.Join(",", serverCampanys.Select(s => s.UserName + s.ShopAccount));
|
var sJoin = string.Join(",", serverCampanys.Select(s => s.UserName + s.ShopAccount));
|
||||||
var serverShop = serverCampanys.FirstOrDefault();
|
var serverShop = serverCampanys.FirstOrDefault();
|
||||||
if (shop != null && serverShop != null)
|
if (shop != null && serverShop != null)
|
||||||
{
|
{
|
||||||
@@ -981,8 +980,8 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
case "编辑":
|
case "编辑":
|
||||||
{
|
{
|
||||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||||
editForm.txtNotes.ReadOnly = true;
|
editForm.lblNotes.Visible = false;
|
||||||
editForm.txtNotes.Enabled = false;
|
editForm.txtNotes.Visible = false;
|
||||||
editForm.SaveCompleteWithDescribe += Sae_SaveComplete;
|
editForm.SaveCompleteWithDescribe += Sae_SaveComplete;
|
||||||
editForm.ShowDialog();
|
editForm.ShowDialog();
|
||||||
}
|
}
|
||||||
@@ -990,10 +989,19 @@ namespace TemuKJD.KJDForms.ShopForms
|
|||||||
case "编辑备注":
|
case "编辑备注":
|
||||||
{
|
{
|
||||||
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
ShopAddEditForm editForm = new ShopAddEditForm(shop);
|
||||||
editForm.txtChatAccount.ReadOnly = true;
|
|
||||||
editForm.txtChatAccount.Enabled = false;
|
|
||||||
editForm.txtShopPassword.ReadOnly = true;
|
editForm.txtShopPassword.ReadOnly = true;
|
||||||
editForm.txtShopPassword.Enabled = false;
|
editForm.txtShopPassword.Enabled = false;
|
||||||
|
editForm.txtShopPassword.Visible = false;
|
||||||
|
editForm.lblShopPassword.Visible = false;
|
||||||
|
|
||||||
|
editForm.txtChatAccount.ReadOnly = true;
|
||||||
|
editForm.txtChatAccount.Enabled = false;
|
||||||
|
editForm.txtChatAccount.Visible = false;
|
||||||
|
editForm.lblChatAccount.Visible = false;
|
||||||
|
|
||||||
|
editForm.lblNotes.Location = editForm.lblShopPassword.Location;
|
||||||
|
editForm.txtNotes.Location = editForm.txtShopPassword.Location;
|
||||||
|
|
||||||
editForm.ShowDialog();
|
editForm.ShowDialog();
|
||||||
if (editForm.HasChange)
|
if (editForm.HasChange)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -875,10 +875,18 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
|
|||||||
if (jArr.Count() == 0)
|
if (jArr.Count() == 0)
|
||||||
return list;
|
return list;
|
||||||
|
|
||||||
list = JsonHelper.DeserializeJsonToList<TemuDBProductPurchasePriceInfo>(jArr.ToString());
|
list = JsonHelper.DeserializeJsonToList<TemuDBProductPurchasePriceInfo>(JsonHelper.SerializeObject(jArr));
|
||||||
foreach (var pPrice in list)
|
foreach (var pPrice in list)
|
||||||
{
|
{
|
||||||
pPrice.dbSkuPurchasePriceList = JsonHelper.DeserializeJsonToList<TemuDBSkuPurchasePriceInfo>(pPrice.sku_purchase_price_json);
|
//skc"19938266422",sku"3733016951"
|
||||||
|
//[{"productSkuId":90853786355,"className":"黑色","productSkuSpecList":null,"priceValue":2974,"purchasePriceValue":1100},{"productSkuId":18684743772,"className":"黑色
|
||||||
|
try
|
||||||
|
{
|
||||||
|
pPrice.dbSkuPurchasePriceList = JsonHelper.DeserializeJsonToList<TemuDBSkuPurchasePriceInfo>(pPrice.sku_purchase_price_json);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
}
|
||||||
if (pPrice.dbSkuPurchasePriceList == null)
|
if (pPrice.dbSkuPurchasePriceList == null)
|
||||||
pPrice.dbSkuPurchasePriceList = new List<TemuDBSkuPurchasePriceInfo>();
|
pPrice.dbSkuPurchasePriceList = new List<TemuDBSkuPurchasePriceInfo>();
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -122,13 +122,13 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
|
|||||||
data += "&skc_id=" + purchasePriceItem.skc_id;
|
data += "&skc_id=" + purchasePriceItem.skc_id;
|
||||||
data += "&cat_id=" + purchasePriceItem.cat_id;
|
data += "&cat_id=" + purchasePriceItem.cat_id;
|
||||||
data += "&cat_name=" + purchasePriceItem.cat_name;
|
data += "&cat_name=" + purchasePriceItem.cat_name;
|
||||||
data += "&ext_code=" + purchasePriceItem.ext_code;
|
data += "&ext_code=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.ext_code);
|
||||||
data += "&product_name=" + purchasePriceItem.product_name;
|
data += "&product_name=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.product_name);
|
||||||
data += "&main_img=" + purchasePriceItem.main_img;
|
data += "&main_img=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.main_img);
|
||||||
data += "&discount=" + purchasePriceItem.discount;
|
data += "&discount=" + purchasePriceItem.discount;
|
||||||
data += "&price_text=" + purchasePriceItem.price_text;
|
data += "&price_text=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.price_text);
|
||||||
data += "&sku_purchase_price_json=" + purchasePriceItem.sku_purchase_price_json;
|
data += "&sku_purchase_price_json=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.sku_purchase_price_json);
|
||||||
data += "¬es=" + purchasePriceItem.notes;
|
data += "¬es=" + GetHtml.UrlEncodeUtf8(purchasePriceItem.notes);
|
||||||
var html = GetHtml.PostUtf8(url, data);
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
//if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
// html = GetHtml.PostUtf8(url, data);
|
// html = GetHtml.PostUtf8(url, data);
|
||||||
|
|||||||
@@ -78,8 +78,6 @@ namespace TemuKJD.PDDForms.ShopForms
|
|||||||
GlobalConfig.ShopLoginList.Add(localShop);
|
GlobalConfig.ShopLoginList.Add(localShop);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList<ShopLoginInfo>();
|
|
||||||
GlobalConfig.DouShopLoginOtherUserShopList.AddRange(localShopList.Where(l => !GlobalConfig.ShopLoginList.Any(s => s.LoginName == l.LoginName)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ShopLoginInfo> GetServerShop()
|
public static List<ShopLoginInfo> GetServerShop()
|
||||||
|
|||||||
+18
-6
@@ -22,6 +22,7 @@ using Work;
|
|||||||
using Work.DouyinApiClass;
|
using Work.DouyinApiClass;
|
||||||
using AllBase.Model.Param.TemuProductManage;
|
using AllBase.Model.Param.TemuProductManage;
|
||||||
using TemuKJD.KJDForms.ShopForms;
|
using TemuKJD.KJDForms.ShopForms;
|
||||||
|
using TemuKJD.KJDForms.AdminForms;
|
||||||
|
|
||||||
namespace TemuKJD
|
namespace TemuKJD
|
||||||
{
|
{
|
||||||
@@ -84,7 +85,7 @@ namespace TemuKJD
|
|||||||
while (!BaseClass.IsLoginSuccess)
|
while (!BaseClass.IsLoginSuccess)
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
|
|
||||||
KJDForms.ShopForms.ShopListForm.UpdateShop();
|
ShopListForm.UpdateShop();
|
||||||
IsShopInit = true;
|
IsShopInit = true;
|
||||||
}));
|
}));
|
||||||
#endregion
|
#endregion
|
||||||
@@ -126,8 +127,10 @@ namespace TemuKJD
|
|||||||
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
#if DEBUG
|
//Thread.Sleep(20000);
|
||||||
#else
|
|
||||||
|
//#if DEBUG
|
||||||
|
//#else
|
||||||
var url = BaseClass.BuildObjString("user/is_get_return_package");
|
var url = BaseClass.BuildObjString("user/is_get_return_package");
|
||||||
var data = Work.UserLogin.GetSignaturex();
|
var data = Work.UserLogin.GetSignaturex();
|
||||||
|
|
||||||
@@ -135,18 +138,23 @@ namespace TemuKJD
|
|||||||
data += "&r2=" + r2;
|
data += "&r2=" + r2;
|
||||||
data += "&c2=" + Work.UserLogin.Encryption(r2);
|
data += "&c2=" + Work.UserLogin.Encryption(r2);
|
||||||
string rstHtml = GetHtml.PostUtf8(url, data);
|
string rstHtml = GetHtml.PostUtf8(url, data);
|
||||||
var isGet = BaseRegex.GetStringJson(ref rstHtml, "is_get").ParseToBool();
|
var isGet = BaseRegex.GetStringJson(ref rstHtml, "is_get") != "false";
|
||||||
|
|
||||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||||
|
//foreach (var shop in AdminShopListForm.lstAdminShopInfo)
|
||||||
{
|
{
|
||||||
if (!isGet)
|
if (!isGet)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
//var index = AdminShopListForm.lstAdminShopInfo.IndexOf(shop);
|
||||||
if (string.IsNullOrEmpty(shop.ShopId))
|
if (string.IsNullOrEmpty(shop.ShopId))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (dicGetReturnPackDate.Keys.Contains(shop.ShopId) && dicGetReturnPackDate[shop.ShopId] == DateTime.Now.ToString("yyyyMMdd")) //今日已获取过
|
if (dicGetReturnPackDate.Keys.Contains(shop.ShopId) && dicGetReturnPackDate[shop.ShopId] == DateTime.Now.ToString("yyyyMMdd")) //今日已获取过,则只读今日
|
||||||
|
{
|
||||||
|
//retrunPackageForm.GetReturnPackage(shop, true, DateTime.Now.Date, DateTime.Now.Date.AddDays(1)); // 后台读取今日退货信息
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -161,11 +169,15 @@ namespace TemuKJD
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
//#endif
|
||||||
for (int i = 0; i < 360; i++)
|
for (int i = 0; i < 360; i++)
|
||||||
{
|
{
|
||||||
Thread.Sleep(10000);
|
Thread.Sleep(10000);
|
||||||
}
|
}
|
||||||
|
for (int i = 0; i < 180; i++)
|
||||||
|
{
|
||||||
|
Thread.Sleep(10000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Reference in new issue
Block a user