修复上次提交bug
This commit is contained in:
1 parent
fae59a4c96
commit
01ba8cba6b
2 files changed
+31
-9
No files matched your search
@@ -27,8 +27,8 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 552;
|
public static int VersionCount = 553;
|
||||||
//public static int VersionCount = 552;
|
//public static int VersionCount = 553;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本号
|
/// 版本号
|
||||||
|
|||||||
@@ -644,13 +644,30 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
var rows = this.dgvAdjust.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList();
|
var rows = this.dgvAdjust.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colProductId"].Value.ParseToString() == price.productId.ParseToString()).ToList();
|
||||||
var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString());
|
var shop = lstAdminShopInfo.FirstOrDefault(s => s.ShopId == price.supplierId.ParseToString());
|
||||||
var html = editPriceProductNameBatchAdd(shop, price.productId.ParseToString());
|
var html = editPriceProductNameBatchAdd(shop, price.productId.ParseToString());
|
||||||
|
|
||||||
|
|
||||||
|
var pName = price.productName;
|
||||||
|
if ((pName.EndsWith("适合不同的搭配风格") && pName.IndexOf("个") < 4 && pName.IndexOf("个") > 0) ||
|
||||||
|
(pName.EndsWith("适合不同的搭配风格") && pName.IndexOf("pcs") < 4 && pName.IndexOf("pcs") > 0))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Invoke(new Action(() =>
|
||||||
|
{
|
||||||
|
foreach (var row in rows)
|
||||||
|
row.Cells["colMsg"].Value = "标题没有可还原的关键字";
|
||||||
|
}));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
//{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}}
|
//{"success":true,"errorCode":1000000,"errorMsg":null,"result":{"handleFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again"}],"addFailedList":[{"failedBizId":4432690492,"failedReason":"This product has pending or in-progress modification tasks, cannot initiate again","failedReasonType":8}],"successBizId2TaskUidMap":{}}}
|
||||||
if (html.Contains("This product has pending or in-progress modification tasks"))
|
if (html.Contains("This product has pending or in-progress modification tasks"))
|
||||||
{
|
{
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
foreach (var row in rows)
|
foreach (var row in rows)
|
||||||
row.Cells["colMsg"].Value = "已提交过修改请求";
|
row.Cells["colMsg"].Value = "已提交过修改任务";
|
||||||
}));
|
}));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -674,14 +691,19 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
JObject jObj = JObject.Parse(html);
|
JObject jObj = JObject.Parse(html);
|
||||||
var item = jObj["result"]["successBizId2TaskUidMap"].LastOrDefault().LastOrDefault();
|
var item = jObj["result"]["successBizId2TaskUidMap"].LastOrDefault().LastOrDefault();
|
||||||
|
|
||||||
var pName = price.productName;
|
|
||||||
var newPName = pName;
|
var newPName = pName;
|
||||||
if (pName.EndsWith("适合不同的搭配风格") && pName.IndexOf("个") < 4)
|
if (pName.EndsWith("适合不同的搭配风格") && pName.IndexOf("个") < 4 && pName.IndexOf("个") > 0)
|
||||||
{
|
{
|
||||||
var headword = pName.Substring(0, pName.IndexOf("个") + 1);
|
var headword = pName.Substring(0, pName.IndexOf("个") + 1);
|
||||||
newPName = pName.Substring(pName.IndexOf("个") + 1);
|
newPName = pName.Substring(pName.IndexOf("个") + "个".Length);
|
||||||
newPName = newPName.Replace("适合不同的搭配风格", "适合" + headword + "不同的搭配风格");
|
newPName = newPName.Replace("适合不同的搭配风格", "适合" + headword + "不同的搭配风格");
|
||||||
}
|
}
|
||||||
|
if (pName.EndsWith("适合不同的搭配风格") && pName.IndexOf("pcs") < 4 && pName.IndexOf("pcs") >0)
|
||||||
|
{
|
||||||
|
var headword = pName.Substring(0, pName.IndexOf("pcs"));
|
||||||
|
newPName = pName.Substring(pName.IndexOf("pcs") + "pcs".Length);
|
||||||
|
newPName = newPName.Replace("适合不同的搭配风格", "适合" + headword + "个不同的搭配风格").Trim();
|
||||||
|
}
|
||||||
|
|
||||||
html = editPriceProductName(shop, item.ParseToString(), price.productId.ParseToString(), newPName);
|
html = editPriceProductName(shop, item.ParseToString(), price.productId.ParseToString(), newPName);
|
||||||
Thread.Sleep(Randomx.GetId(25, 75));
|
Thread.Sleep(Randomx.GetId(25, 75));
|
||||||
@@ -697,9 +719,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
{
|
{
|
||||||
string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString();
|
string sErrMsg = BaseRegex.GetStringJson(ref html, "errorMsg").ParseToString();
|
||||||
if (string.IsNullOrEmpty(sErrMsg))
|
if (string.IsNullOrEmpty(sErrMsg))
|
||||||
{
|
|
||||||
sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString();
|
sErrMsg = BaseRegex.GetStringJson(ref html, "error_msg").ParseToString();
|
||||||
}
|
if (string.IsNullOrEmpty(sErrMsg))
|
||||||
|
sErrMsg = html;
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
foreach (var row in rows)
|
foreach (var row in rows)
|
||||||
@@ -721,7 +743,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
|
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
this.pbLoading.Visible = true;
|
this.pbLoading.Visible = false;
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user