1修复sku有特殊字符被截断的bug 2优化店铺进店/登录逻辑

This commit is contained in:
wule committed 2025-12-23 10:50:33 +08:00
1 parent 91b1ea7dbc
commit 358bb5490e
21 files changed
+304 -171

No files matched your search

@@ -289,7 +289,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
data += "&get_select_count=true";
data += "&select_shop_id=" + shop.ShopId;
}
else if (BaseClass.SaLevel > 0) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
else if (BaseClass.SaLevel > 0 || IsClientJit) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
{
data += "&product_get_type=all";
}
@@ -517,8 +517,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
if (IsClientJit)
data += "&is_client_jit=true";
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"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -292,7 +292,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
Task.Run(() =>
{
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);
this.ucSplitPage1.TotalPage = pageCount;
@@ -357,6 +358,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
Invoke(new Action(() =>
{
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>();
pageCount = 1;
seconds = 0;
var url = BaseClass.BuildObjString("product/admin_get_user_select_product_list");
if (ClientMode != EnumClientMode.Admin)
@@ -416,6 +425,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
return new List<TemuDBProductSelect>();
}
seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
int count = BaseRegex.GetIntJson(ref html, "count");
pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
pageCount = Math.Max(pageCount, 1);
@@ -1025,8 +1035,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
}
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"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))