新增活动 23730 23456 修复情趣类目无法上传问题
This commit is contained in:
1 parent
b958280afd
commit
1c7ccd3a03
12 files changed
+1485
-2854
No files matched your search
+406
-309
File diff suppressed because it is too large.
Load diff
@@ -180,9 +180,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
if (BaseClass.SaLevel == 1)
|
||||
{
|
||||
dgvSelectProduct.Columns["colSkuFakeImg"].Visible = true;
|
||||
cmbTextStyle.Visible = true;
|
||||
cmbTextStyle.Text = pddUploadRule.activitySkuImgTextStyle;
|
||||
}
|
||||
#if DEBUG
|
||||
dgvSelectProduct.Columns["colSkuFakeImg"].Visible = true;
|
||||
cmbTextStyle.Visible = true;
|
||||
cmbTextStyle.Text = pddUploadRule.activitySkuImgTextStyle;
|
||||
#endif
|
||||
|
||||
IsLoadComplate = true;
|
||||
@@ -263,10 +267,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
private void RefreshDbProd()
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter); // 同时刷新下商品分组
|
||||
{
|
||||
// 同时刷新下商品分组
|
||||
PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter);
|
||||
|
||||
// 刷新类目信息
|
||||
GetPddProductCate();
|
||||
Invoke(new Action(() => { cmbSourceType_SelectedIndexChanged(null, null); }));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -288,16 +295,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
}
|
||||
else
|
||||
{
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
cmbCateFilter.Items.Clear();
|
||||
var groups = BaseRegex.GetStringJson(ref html, "data");
|
||||
foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
{
|
||||
cmbCateFilter.Items.Add(item);
|
||||
}
|
||||
cmbCateFilter.Items.Add("");
|
||||
}));
|
||||
//Invoke(new Action(() =>
|
||||
//{
|
||||
// cmbCateFilter1.Items.Clear();
|
||||
// var groups = BaseRegex.GetStringJson(ref html, "data");
|
||||
// foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
// {
|
||||
// cmbCateFilter1.Items.Add(item);
|
||||
// }
|
||||
// cmbCateFilter1.Items.Add("");
|
||||
//}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5972,7 +5979,38 @@ Content-Type: image/jpeg
|
||||
data += "&in_ext_codes=" + txtExtCodeFilter.Text;
|
||||
data += "&in_spu_ids=" + txtIdFilter.Text;
|
||||
data += "&in_groups=" + cmbGroupFilter.Text;
|
||||
data += "&in_cates=" + cmbCateFilter.Text;
|
||||
|
||||
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();
|
||||
var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
|
||||
var selectCate3 = cates3.Where(c => c.level == 3 && (";" + cmbCateFilter3.Text.Trim() + ";").Contains(";" + c.name + ";")).ToList();
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
{
|
||||
data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!string.IsNullOrEmpty(cmbCateFilter1.Text) && selectCate1?.Count > 0)
|
||||
data += "&wx_cat_1=" + string.Join(",", selectCate1.Select(c => c.cat_id).ToList());
|
||||
//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?.Count > 0)
|
||||
data += "&wx_cat_2=" + string.Join(",", selectCate2.Select(c => c.cat_id).ToList());
|
||||
if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && selectCate3?.Count > 0)
|
||||
data += "&wx_cat_3=" + string.Join(",", selectCate3.Select(c => c.cat_id).ToList());
|
||||
}
|
||||
if (selectCate1.Count == 0 && cmbSourceType.Text == "厂商直采" && 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));
|
||||
}
|
||||
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim();
|
||||
if (cmbSourceType.Text.Trim() == "厂商直采")
|
||||
{
|
||||
@@ -5980,13 +6018,6 @@ Content-Type: image/jpeg
|
||||
data += "&is_supplier_prod_ok=" + "已设置";
|
||||
data += "&wx_safe_status=" + "安全商品,未校验";
|
||||
}
|
||||
|
||||
if (cmbSourceType.Text == "厂商直采" && 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));
|
||||
}
|
||||
}));
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
@@ -6216,7 +6247,7 @@ Content-Type: image/jpeg
|
||||
txtIdFilter.Text = "";
|
||||
txtExtCodeFilter.Text = "";
|
||||
cmbGroupFilter.Text = "";
|
||||
cmbCateFilter.Text = "";
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbSourceType.Text = "";
|
||||
int prodCount;
|
||||
GetRandomProductList(out prodCount, 1, 1);
|
||||
@@ -7157,11 +7188,12 @@ Content-Type: image/jpeg
|
||||
}));
|
||||
// 获取类目属性模板
|
||||
var pddApiCatRule = new PddApi(shop);
|
||||
pddApiCatRule.Data["cat_id"] = prodInfo.detail.cat_id;
|
||||
pddApiCatRule.Data["cat_id"] = prodInfo.detail.cat_id; // 23147
|
||||
var catRuleGetRst = pddApiCatRule.PddGoodsCatRuleGet();
|
||||
if (!catRuleGetRst.Contains("\"cat_rule_get_response\""))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJson(ref catRuleGetRst, "error_msg");
|
||||
errMsg += " " + BaseRegex.GetStringJson(ref catRuleGetRst, "sub_msg");
|
||||
if (string.IsNullOrEmpty(errMsg))
|
||||
errMsg = catRuleGetRst;
|
||||
return "类目属性初始化失败 " + errMsg;
|
||||
@@ -7672,7 +7704,7 @@ Content-Type: image/jpeg
|
||||
//if (text1.Length + text2.Length <= 6)
|
||||
// text2 = "专柜品质 " + text2; // 专柜正品
|
||||
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, "到手 " + text1 + " " + text2);
|
||||
imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, text1 + " " + text2);
|
||||
imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha, text1 + " " + text2, pddUploadRule);
|
||||
//imgBase64 = PddGetImgBase64ForApi(out errMsg, addPriceSkuInfoLst[i].thumb_url, fakeImg, pbUpgradeVersion.Image, alpha);
|
||||
}
|
||||
else
|
||||
@@ -7721,6 +7753,11 @@ Content-Type: image/jpeg
|
||||
pddApi.Data["is_refundable"] = true;
|
||||
goto retry;
|
||||
}
|
||||
if (upLoadRst.Contains("必选保密发货") && retryTimes >= 0)
|
||||
{
|
||||
pddApi.Data["privacy_delivery"] = 1;
|
||||
goto retry;
|
||||
}
|
||||
if (!upLoadRst.Contains("goods_add_response"))
|
||||
{
|
||||
var errMsg = BaseRegex.GetStringJson(ref upLoadRst, "error_msg");
|
||||
@@ -8039,7 +8076,7 @@ Content-Type: image/jpeg
|
||||
//foreach (var spec_prop in prodInfo.property.sku_properties) ...
|
||||
}
|
||||
|
||||
public static string PddGetImgBase64ForApi(out string errorMsg, string img_url, Image fakeImg = null, Image imgUp = null, float alpha = 0.05f, string text = "", int imgWidth = 0, int imgHeight = 0)
|
||||
public static string PddGetImgBase64ForApi(out string errorMsg, string img_url, Image fakeImg = null, Image imgUp = null, float alpha = 0.05f, string text = "", PddUploadRule uploadRule = null, int imgWidth = 0, int imgHeight = 0)
|
||||
{
|
||||
errorMsg = "";
|
||||
string imgBase64 = "";
|
||||
@@ -8150,7 +8187,8 @@ Content-Type: image/jpeg
|
||||
var deltaX = 180 * imageBg.Width / 800;
|
||||
var colors = new List<Color> { Color.Red, Color.DarkRed, Color.Green, Color.LightSeaGreen, Color.DarkOrange, Color.Aqua, Color.DeepSkyBlue, Color.Blue, Color.Magenta };
|
||||
var backColors = new List<Color> { Color.Black, Color.DarkBlue, Color.Purple, Color.White, Color.LightYellow, Color.SkyBlue };
|
||||
//colors = new List<Color> { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
colors = new List<Color> { Color.Red, Color.Blue, Color.Green, Color.DarkBlue, Color.DarkOrange, Color.DarkRed };
|
||||
var line = 0;
|
||||
var textCount = 0;
|
||||
foreach (var t in text)
|
||||
@@ -8228,10 +8266,12 @@ Content-Type: image/jpeg
|
||||
rectF = new RectangleF(deltaX, yPos, px, py);
|
||||
g.DrawString(text1.Trim(), font, textBrush, rectF);
|
||||
|
||||
//break;
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
break;
|
||||
}
|
||||
|
||||
//break;
|
||||
if (uploadRule?.activitySkuImgTextStyle == "双色字体")
|
||||
break;
|
||||
}
|
||||
|
||||
//font = new Font("微软雅黑", fontSize, FontStyle.Regular);
|
||||
@@ -8387,6 +8427,125 @@ Content-Type: image/jpeg
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbTextStyle_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
pddUploadRule.activitySkuImgTextStyle = cmbTextStyle.Text;
|
||||
}
|
||||
|
||||
private void label8_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void label20_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public string pdd_product_cates = "";
|
||||
void fillPddCate()
|
||||
{
|
||||
cmbCateFilter1.Items.Clear();
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Items.Clear();
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter3.Text = "";
|
||||
foreach (var item in pdd_product_cates.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries))
|
||||
{
|
||||
cmbCateFilter1.Items.Add(item);
|
||||
}
|
||||
cmbCateFilter1.Items.Add("");
|
||||
}
|
||||
|
||||
void fillWxCate()
|
||||
{
|
||||
cmbCateFilter1.Items.Clear();
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Items.Clear();
|
||||
cmbCateFilter1.Text = "";
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter3.Text = "";
|
||||
foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList())
|
||||
{
|
||||
cmbCateFilter1.Items.Add(cate.name);
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
fillPddCate();
|
||||
else
|
||||
fillWxCate();
|
||||
}
|
||||
|
||||
private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter2_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter3_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void cmbCateFilter1_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCateFilter2.Text = "";
|
||||
cmbCateFilter2.Items.Clear();
|
||||
cmbCateFilter3.Text = "";
|
||||
cmbCateFilter3.Items.Clear();
|
||||
var selectCate1 = GlobalConfig.WxCatList
|
||||
.Where(c => c.level == 1 && (cmbCateFilter1.Text.Trim() == cmbCateFilter1.DefaultText || (";" + cmbCateFilter1.Text.Trim() + ";")
|
||||
.Contains(";" + c.name + ";"))).ToList();
|
||||
var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList();
|
||||
//foreach (var cate2 in cates2)
|
||||
//{
|
||||
// cmbCat2.Items.Add(cate2.name);
|
||||
//}
|
||||
cmbCateFilter2.Items.AddRange(cates2.Select(c => c.name).ToArray());
|
||||
}
|
||||
|
||||
private void cmbCateFilter2_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
|
||||
return;
|
||||
|
||||
cmbCateFilter3.Text = "";
|
||||
cmbCateFilter3.Items.Clear();
|
||||
var selectCate1 = GlobalConfig.WxCatList
|
||||
.Where(c => c.level == 1 && (cmbCateFilter1.Text.Trim() == cmbCateFilter1.DefaultText || (";" + 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() == cmbCateFilter1.DefaultText || (";" + cmbCateFilter2.Text.Trim() + ";")
|
||||
.Contains(c.name))).ToList();
|
||||
var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList();
|
||||
//foreach (var cate3 in cates3)
|
||||
//{
|
||||
// cmbCat3.Items.Add(cate3.name);
|
||||
//}
|
||||
cmbCateFilter3.Items.AddRange(cates3.Select(c => c.name).ToArray());
|
||||
}
|
||||
|
||||
private void cmbCateFilter3_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
//var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCat1.Text.Trim());
|
||||
//var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList();
|
||||
//var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCat1.Text.Trim());
|
||||
//var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList();
|
||||
//var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCat1.Text.Trim());
|
||||
}
|
||||
}
|
||||
|
||||
public class AddPriceRule
|
||||
@@ -8454,5 +8613,7 @@ Content-Type: image/jpeg
|
||||
public bool sign22347 { get; set; }
|
||||
public bool sign15996 { get; set; }
|
||||
public bool sign21365 { get; set; }
|
||||
|
||||
public string activitySkuImgTextStyle { get; set; } = "双色字体";
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user