优化web查询 新增学员数据 尝试64位软件
This commit is contained in:
1 parent
30beb00fc4
commit
caba307ed1
44 files changed
+738
-1769
No files matched your search
@@ -352,7 +352,12 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
}
|
||||
if (BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集"))
|
||||
{
|
||||
cmbSourceType.Items.Insert(1, "------");
|
||||
if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
|
||||
{
|
||||
cmbSourceType.Items.Insert(1, "--------");
|
||||
cmbSourceType.Items.Insert(1, "学员数据");
|
||||
}
|
||||
cmbSourceType.Items.Insert(1, "--------");
|
||||
cmbSourceType.Items.Insert(1, "微信商品");
|
||||
cmbSourceType.Items.Insert(1, "1688商品");
|
||||
cmbSourceType.Items.Insert(1, "多多商品");
|
||||
@@ -362,6 +367,12 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
this.lblSourceType.Visible = true;
|
||||
this.cmbSourceType.Visible = true;
|
||||
this.cmbSourceType.Items.Clear();
|
||||
cmbSourceType.Items.Add("");
|
||||
if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据"))
|
||||
{
|
||||
cmbSourceType.Items.Add("学员数据");
|
||||
cmbSourceType.Items.Add("--------");
|
||||
}
|
||||
this.cmbSourceType.Items.Add("多多商品,1688商品,微信商品");
|
||||
this.cmbSourceType.Items.Add("多多商品");
|
||||
this.cmbSourceType.Items.Add("1688商品");
|
||||
@@ -584,9 +595,9 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
//cmbGroupFilter.Items.Remove("用户" + mainUserName);
|
||||
cmbGroupFilter.Items.Remove("------");
|
||||
cmbGroupFilter.Items.Remove("--------");
|
||||
cmbGroupFilter.Items.Remove("我的商品");
|
||||
cmbGroupFilter.Items.Insert(0, "------");
|
||||
cmbGroupFilter.Items.Insert(0, "--------");
|
||||
cmbGroupFilter.Items.Insert(0, "我的商品");
|
||||
}));
|
||||
}
|
||||
@@ -1386,7 +1397,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
if (noBanWx)
|
||||
data += "&ban_wx=0";
|
||||
if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
|
||||
data += "&special_prod_type=普通商品,书籍,爆款数据";
|
||||
data += "&special_prod_type=普通商品,爆款数据";
|
||||
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
@@ -3410,6 +3421,15 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
attrValue = match + " cm";
|
||||
}
|
||||
}
|
||||
else if (attr.value == "mm")
|
||||
{
|
||||
var propValue = propInfo.values.FirstOrDefault()?.value;
|
||||
var match = BaseRegex.GetMatchRegexString(ref propValue, @"([\d]{1,4})mm");
|
||||
if (!string.IsNullOrEmpty(match))
|
||||
{
|
||||
attrValue = match + " mm";
|
||||
}
|
||||
}
|
||||
else if (attr.value.Contains("岁以上") && attr.value.Contains("个月以上"))
|
||||
{
|
||||
attrValue = "7 岁以上";
|
||||
@@ -3698,6 +3718,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
attrValue = "100 g";
|
||||
else if (attr.value == "cm")
|
||||
attrValue = "20 cm";
|
||||
else if (attr.value == "mm")
|
||||
attrValue = "20 mm";
|
||||
else if (attr.value.Contains("岁以上") && attr.value.Contains("个月以上"))
|
||||
attrValue = "7 岁以上";
|
||||
else if (attr.value == "只;个")
|
||||
@@ -5434,6 +5456,11 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
if ((BaseClass.UserAuthority.Contains("商品采集") || BaseClass.UserAuthority.Contains("商品采集")) &&
|
||||
cmbHot.Text != "爆款数据" && !BaseClass.UserAuthority.Contains("货源选择"))
|
||||
data += "&add_user_name=" + (BaseClass.GroupId == 3 ? BaseClass.UserName : BaseClass.ParentUserName);
|
||||
|
||||
if (!BaseClass.UserAuthority.Contains("学员数据") && !BaseClass.ParentAuthority.Contains("学员数据") && cmbSourceType.Text.Contains("学员数据"))
|
||||
{
|
||||
cmbSourceType.Text = cmbSourceType.Text.Replace("学员数据", "");
|
||||
}
|
||||
// 如果指定只有自己采集的商品,则只会随机自己采集的商品
|
||||
else if ((cmbSourceType.Text.Trim().Contains("多多商品") || cmbSourceType.Text.Trim().Contains("1688商品") || cmbSourceType.Text.Trim().Contains("微信商品")) &&
|
||||
cmbSourceType.Text.Trim().Replace("多多商品", "").Replace("1688商品", "").Replace("微信商品", "").Trim(',').IsNullOrEmpty())
|
||||
@@ -5448,30 +5475,12 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采");
|
||||
}
|
||||
|
||||
//if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
|
||||
|
||||
if (btnSwitchCatType.Text == "P")
|
||||
data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
|
||||
else
|
||||
{
|
||||
//var selectCate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCateFilter1.Text.Trim());
|
||||
//var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == selectCate1?.cat_id).ToList();
|
||||
//var selectCate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCateFilter2.Text.Trim());
|
||||
//var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == selectCate2?.cat_id).ToList();
|
||||
//var selectCate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCateFilter3.Text.Trim());
|
||||
|
||||
//if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && selectCate1 != null)
|
||||
// data += "&wx_cat_1=" + selectCate1.cat_id;
|
||||
//else if (chkSkipQualification.Checked)
|
||||
//{
|
||||
// // 厂商直采普通店铺不要随特殊商品
|
||||
// data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c=>c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品"))
|
||||
// .Select(c => c.cat_id));
|
||||
//}
|
||||
//if (!string.IsNullOrEmpty(cmbCateFilter2.Text) && selectCate2 != null)
|
||||
// data += "&wx_cat_2=" + selectCate2.cat_id;
|
||||
//if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && selectCate3 != null)
|
||||
// data += "&wx_cat_3=" + selectCate3.cat_id;
|
||||
|
||||
var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (";" + cmbCateFilter1.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
|
||||
var selectCate2 = cates2.Where(c => c.level == 2 && (";" + cmbCateFilter2.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
@@ -5496,12 +5505,12 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
// 爆款数据商品
|
||||
// 不为空搜内容
|
||||
if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim()))
|
||||
data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍");
|
||||
data += "&special_prod_type=" + cmbHot.Text;
|
||||
// 为空按照权限搜
|
||||
else if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
|
||||
data += "&special_prod_type=爆款数据,普通商品,书籍";
|
||||
data += "&special_prod_type=爆款数据,普通商品";
|
||||
else
|
||||
data += "&special_prod_type=普通商品,书籍";
|
||||
data += "&special_prod_type=普通商品";
|
||||
|
||||
// 聚水潭商品处理条件校验
|
||||
data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim();
|
||||
@@ -5525,8 +5534,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
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"))
|
||||
// html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
|
||||
Reference in new issue
Block a user