1拼多多买手读单优化 2商品类目查询优化
This commit is contained in:
1 parent
7601f5b2f3
commit
4ae8e4f1b2
40 files changed
+4743
-745
No files matched your search
@@ -405,7 +405,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
List<Task> tList = new List<Task>();
|
||||
if (idRefreshTodayHasGet)
|
||||
GlobalConfig.lstWxShopAuthInfo.RemoveAll(s => updateIds.Contains(s.ShopId));
|
||||
foreach (var shop in GlobalConfig.ShopLoginList.Where(s => updateIds.Contains(s.ShopId)))
|
||||
foreach (var shop in GlobalConfig.ValidShopLoginList.Where(s => updateIds.Contains(s.ShopId)))
|
||||
{
|
||||
Invoke(new Action(() => { BindShop(shop, selectIds, ""); }));
|
||||
var t = Task.Run(() =>
|
||||
@@ -477,7 +477,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
}
|
||||
else
|
||||
{
|
||||
//var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId);
|
||||
//var list = GlobalConfig.ValidShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId);
|
||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||
{
|
||||
//if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
|
||||
@@ -512,7 +512,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
foreach (var shop in GlobalConfig.ShopLoginList)
|
||||
foreach (var shop in GlobalConfig.ValidShopLoginList)
|
||||
{
|
||||
//if (shop.LoginStatus == "登录成功")
|
||||
//{
|
||||
@@ -554,6 +554,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
GetPddProductCate();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
this.btnSwitchCatType.Text = "P";
|
||||
btnSwitchCatType_Click(null, null);
|
||||
pbLoadingShop.Visible = false;
|
||||
}));
|
||||
});
|
||||
@@ -578,17 +580,17 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
pdd_product_cates = BaseRegex.GetStringJson(ref html, "data");
|
||||
}
|
||||
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采" && cmbSourceType.Text.Trim() != "微信小店")
|
||||
{
|
||||
fillPddCate();
|
||||
}
|
||||
else
|
||||
{
|
||||
fillWxCate();
|
||||
}
|
||||
}));
|
||||
//Invoke(new Action(() =>
|
||||
//{
|
||||
// if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采" && cmbSourceType.Text.Trim() != "微信小店")
|
||||
// {
|
||||
// fillPddCate();
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// fillWxCate();
|
||||
// }
|
||||
//}));
|
||||
}
|
||||
|
||||
void fillPddCate()
|
||||
@@ -627,25 +629,25 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
|
||||
// 获取被删除的店铺
|
||||
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
|
||||
=> !GlobalConfig.ValidShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
|
||||
// 更新被删除的店铺列表
|
||||
foreach (var row in dgvRowList)
|
||||
{
|
||||
dgvShop.Rows.Remove(row);
|
||||
}
|
||||
// 绑定其他店铺(含新导入的店铺)
|
||||
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
|
||||
foreach (ShopLoginInfo shopEntity in GlobalConfig.ValidShopLoginList)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(shopEntity.ShopId))
|
||||
BindShop(shopEntity, selectIds);
|
||||
}
|
||||
cmbFilterShopNotes.Items.Clear();
|
||||
foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
{
|
||||
cmbFilterShopNotes.Items.Add(note);
|
||||
}
|
||||
cmbFilterShopGroup.Items.Clear();
|
||||
foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
foreach (var note in GlobalConfig.ValidShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
|
||||
{
|
||||
cmbFilterShopGroup.Items.Add(note);
|
||||
}
|
||||
@@ -725,12 +727,17 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
if (e.ColumnIndex < 0 || e.RowIndex < 0)
|
||||
return;
|
||||
var row = dgvShop.Rows[e.RowIndex];
|
||||
string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText;
|
||||
string columnName = dgvShop.Columns[e.ColumnIndex].Name;
|
||||
string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString();
|
||||
string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString();
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString());
|
||||
var row = dgvShop.Rows[e.RowIndex];
|
||||
var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString());
|
||||
if (shop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("店铺不存在或已过期");
|
||||
return;
|
||||
}
|
||||
switch (columnName)
|
||||
{
|
||||
case "colSelect":
|
||||
@@ -746,9 +753,9 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
|
||||
}
|
||||
//else
|
||||
{
|
||||
//BaseMsgForm.ShowInfo("店铺未登录!");
|
||||
}
|
||||
//{
|
||||
// BaseMsgForm.ShowInfo("店铺未登录!");
|
||||
//}
|
||||
|
||||
dicCheckedShopId[row.Cells["colShopId"].Value.ParseToString()] = row.Cells["colSelect"].Value.ParseToBool();
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_checked_shop_dic", dicCheckedShopId);
|
||||
@@ -801,13 +808,18 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
if (e.ColumnIndex < 0 || e.RowIndex < 0)
|
||||
return;
|
||||
string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText;
|
||||
var row = dgvShop.Rows[e.RowIndex];
|
||||
var headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText;
|
||||
var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString();
|
||||
var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId);
|
||||
var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
|
||||
var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
|
||||
var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
|
||||
if (shop == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("店铺不存在或已过期");
|
||||
return;
|
||||
}
|
||||
switch (headerText)
|
||||
{
|
||||
case "删除":
|
||||
@@ -862,7 +874,6 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void btnUpload_Click(object sender, EventArgs e)
|
||||
{
|
||||
var shopIdLst = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
|
||||
@@ -973,7 +984,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
continue;
|
||||
}
|
||||
var randomShopLst = new ConcurrentList<ShopLoginInfo>();
|
||||
randomShopLst.AddRange(GlobalConfig.ShopLoginList.Where(s => shopIdLst.Contains(s.ShopId) && s.LoginStatus == "登录成功"));
|
||||
randomShopLst.AddRange(GlobalConfig.ValidShopLoginList.Where(s => shopIdLst.Contains(s.ShopId) && s.LoginStatus == "登录成功"));
|
||||
if (randomShopLst.Count <= 0)
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
@@ -1113,7 +1124,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
DateTime startTime = DateTime.Now;
|
||||
for (int j = 0; j < 1; j++)
|
||||
{
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == selectProd.shop_id);
|
||||
var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == selectProd.shop_id);
|
||||
if (shop == null)
|
||||
continue;
|
||||
|
||||
@@ -5048,10 +5059,15 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
else
|
||||
data += "&add_user_name=" + addUserName;
|
||||
|
||||
// 采集来源判断
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("多多商品","机会商品").Replace("1688商品", "1688厂家,1688外部数据");
|
||||
if (!string.IsNullOrWhiteSpace(cmbSourceType.Text.Trim()))
|
||||
{
|
||||
// 采集来源判断
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据")
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据");
|
||||
}
|
||||
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
//if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
if (btnSwitchCatType.Text == "P")
|
||||
data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
|
||||
else
|
||||
{
|
||||
@@ -5397,7 +5413,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
var row = this.dgvSelectProduct.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colDraftId"].Value.ParseToString() == prodParam.product.productKey.productId);
|
||||
if (row == null)
|
||||
continue;
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString());
|
||||
var shop = GlobalConfig.ValidShopLoginList.FirstOrDefault(s => s.ShopId == row.Cells["colSupplierId"].Value.ParseToString());
|
||||
if (shop == null)
|
||||
continue;
|
||||
var t =Task.Run(() =>
|
||||
@@ -5548,10 +5564,10 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
|
||||
private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
fillPddCate();
|
||||
else
|
||||
fillWxCate();
|
||||
//if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
// fillPddCate();
|
||||
//else
|
||||
// fillWxCate();
|
||||
|
||||
if (cmbSourceType.Text != "厂商直采"/* && cmbSourceType.Text != "1688厂家"*/)
|
||||
{
|
||||
@@ -5562,7 +5578,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
cmbJstInitSet.Text = "已设置";
|
||||
}
|
||||
|
||||
string sourceType = cmbSourceType.Text.Trim();
|
||||
string sourceType = cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据");
|
||||
Task.Run(() =>
|
||||
{
|
||||
// 同时刷新下商品分组
|
||||
@@ -5948,6 +5964,20 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_prod_fission_title", txtFissionTitle.Text);
|
||||
lblFissionTitleCount.Text = "标题数:" + txtFissionTitle.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).ToList().Count();
|
||||
}
|
||||
|
||||
private void btnSwitchCatType_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (btnSwitchCatType.Text == "W")
|
||||
{
|
||||
btnSwitchCatType.Text = "P";
|
||||
fillPddCate();
|
||||
}
|
||||
else
|
||||
{
|
||||
btnSwitchCatType.Text = "W";
|
||||
fillWxCate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class WXUpload
|
||||
|
||||
Reference in new issue
Block a user