优化部分食品类目上传
This commit is contained in:
1 parent
0d882571c1
commit
c8f586d8fc
6 files changed
+3544
-3499
No files matched your search
+12
-10
@@ -451,16 +451,18 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
//
|
||||
this.cmbType.FormattingEnabled = true;
|
||||
this.cmbType.Items.AddRange(new object[] {
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"超重扣费支出",
|
||||
"退货包裹扣费支出",
|
||||
"云仓退货扣费支出"});
|
||||
this.cmbType.Location = new System.Drawing.Point(63, 50);
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"额外包裹扣费支出/返还",
|
||||
"退货包裹扣费支出/返还",
|
||||
"云仓退货扣费支出/返还",
|
||||
"超重扣费支出",
|
||||
"同步物流"});
|
||||
this.cmbType.Location = new System.Drawing.Point(63, 50);
|
||||
this.cmbType.Name = "cmbType";
|
||||
this.cmbType.Size = new System.Drawing.Size(90, 25);
|
||||
this.cmbType.TabIndex = 0;
|
||||
|
||||
@@ -92,23 +92,27 @@ namespace TemuKJD.WXForms.AdminForms
|
||||
data3 += "&user_name_in=" + txtUserName.Text.Trim();
|
||||
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if (cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31,32";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24,28,33,37,41";
|
||||
else if (cmbType.Text == "同步物流")
|
||||
data3 += "&type_in=55";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
data3 += "&type_in=" + cmbType.Text;
|
||||
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
|
||||
+3415
-3415
File diff suppressed because it is too large.
Load diff
@@ -3845,7 +3845,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
#endregion
|
||||
|
||||
WXUploadProductInfoRecommendParam recommendParamRst = new WXUploadProductInfoRecommendParam();
|
||||
if (chkUseRecommand.Checked)
|
||||
WXUploadProductInfoRecommendParam foodRecommendParamRst = new WXUploadProductInfoRecommendParam();
|
||||
if (chkUseRecommand.Checked || upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
|
||||
{
|
||||
WXUploadProductInfoRecommendParam recommendParam = new WXUploadProductInfoRecommendParam();
|
||||
//recommendParam.productId = upProdParam.product.productKey.productId;
|
||||
@@ -3860,13 +3861,19 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
var recommendRst = WXUpload.generalProductInfoRecommend(shop, recommendParam);
|
||||
if (recommendRst.Contains("\"code\":0"))
|
||||
{
|
||||
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
||||
if (chkUseRecommand.Checked)
|
||||
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
||||
foodRecommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
|
||||
}
|
||||
}
|
||||
if (recommendParamRst.productInfo == null)
|
||||
recommendParamRst.productInfo = new RecommendProductInfoParam();
|
||||
if (recommendParamRst.productInfo.param == null)
|
||||
recommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
|
||||
if (foodRecommendParamRst.productInfo == null)
|
||||
foodRecommendParamRst.productInfo = new RecommendProductInfoParam();
|
||||
if (foodRecommendParamRst.productInfo.param == null)
|
||||
foodRecommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
|
||||
|
||||
#region 匹配产品属性
|
||||
//真丝、蚕丝、香云纱、羊绒、羊毛、羊羔毛、羽绒、皮草
|
||||
@@ -3996,7 +4003,9 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
else if (propInfo.name == "食品生产许可证编号")
|
||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号");
|
||||
else if (propInfo.name == "产品标准号")
|
||||
{
|
||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "产品标准号");
|
||||
}
|
||||
else if (propInfo.name == "保质期")
|
||||
attr = productAttr.attr.FirstOrDefault(r => r.name == "保质期");
|
||||
else if (propInfo.name == "生产日期")
|
||||
@@ -4370,7 +4379,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
|
||||
if (attr.isRequired != true)
|
||||
continue;
|
||||
// 已填写内没有但是必填属性
|
||||
// 已填写的属性里没有 但 是必填属性
|
||||
if (upProdParam.product.info.param.Any(p => p.categorys.FirstOrDefault()?.name == attr.name))
|
||||
continue;
|
||||
|
||||
@@ -4582,6 +4591,30 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
wxPropParam.categorys.Add(wxCategoryParam1);
|
||||
wxPropParam.categorys.Add(wxCategoryParam2);
|
||||
}
|
||||
// 产品标准号单独处理
|
||||
if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
|
||||
{
|
||||
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
|
||||
foreach (var param in upProdParam.product.info.param.ToList())
|
||||
{
|
||||
var propName = param.categorys.FirstOrDefault()?.name;
|
||||
var propValue = param.categorys.LastOrDefault()?.name.ParseToString();
|
||||
if (propName == "产品标准号" && (propValue.IsNullOrEmpty() || propValue.Length <= 5 || illegalValueList.Any(v => propValue.Contains(v))))
|
||||
{
|
||||
var recommendParam = foodRecommendParamRst.productInfo.param.FirstOrDefault(p => p.categorys?.FirstOrDefault()?.name == propName);
|
||||
if (recommendParam != null && recommendParam.categorys.Count == 2)
|
||||
{
|
||||
if (param.categorys.LastOrDefault() != null)
|
||||
param.categorys.LastOrDefault().name = recommendParam.categorys[1].name;
|
||||
}
|
||||
else if (upProdParam.product.info.category.LastOrDefault()?.name == "巧克力")
|
||||
{
|
||||
if (param.categorys.LastOrDefault() != null)
|
||||
param.categorys.LastOrDefault().name = "QB/T19343";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (upProdParam.product.info.category.FirstOrDefault()?.name == "图书" || prodInfo.detail.cats.FirstOrDefault() == "书籍/杂志/报纸")
|
||||
{
|
||||
foreach (var param in upProdParam.product.info.param.ToList())
|
||||
@@ -5571,16 +5604,17 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
string address = "地址:见包装";
|
||||
string Storage = "贮存条件:常温";
|
||||
|
||||
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
|
||||
foreach (var propParam in upProdParam.product.info.param)
|
||||
{
|
||||
if (propParam.categorys[0].name.Contains("食品名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装") &&
|
||||
if (propParam.categorys[0].name.Contains("食品名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)) &&
|
||||
!propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5)
|
||||
foodName = "食品名称:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("生产企业名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
||||
else if (propParam.categorys[0].name.Contains("生产企业名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||
companyName = "生产商名称:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
||||
else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||
SCID = "食品生产许可证编号:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("产品标准号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装"))
|
||||
else if (propParam.categorys[0].name.Contains("产品标准号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||
GBID = "产品标准号:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("保质期"))
|
||||
ExpDate = "保质期:" + propParam.categorys[1].name;
|
||||
@@ -5590,7 +5624,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
NetContent = "净含量:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("包装方式"))
|
||||
Pack = "包装方式:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("配料表"))
|
||||
else if (propParam.categorys[0].name.Contains("配料表") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
|
||||
inList = "配料表:" + propParam.categorys[1].name;
|
||||
else if (propParam.categorys[0].name.Contains("联系方式"))
|
||||
contact = "联系方式:" + propParam.categorys[1].name;
|
||||
|
||||
+11
-10
@@ -395,17 +395,18 @@ namespace Work._29Tools.Forms.UserForms
|
||||
//
|
||||
this.cmbType.FormattingEnabled = true;
|
||||
this.cmbType.Items.AddRange(new object[] {
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"超重扣费支出",
|
||||
"退货包裹扣费支出",
|
||||
"云仓退货扣费支出",
|
||||
"",
|
||||
"充值",
|
||||
"管理员充值",
|
||||
"支付宝充值",
|
||||
"礼物单支出/礼物单退费",
|
||||
"拍单扣除/作废返还",
|
||||
"额外包裹扣费支出/返还",
|
||||
"退货包裹扣费支出/返还",
|
||||
"云仓退货扣费支出/返还",
|
||||
"超重扣费支出",
|
||||
"同步物流"});
|
||||
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
||||
this.cmbType.Location = new System.Drawing.Point(55, 20);
|
||||
this.cmbType.Name = "cmbType";
|
||||
this.cmbType.Size = new System.Drawing.Size(121, 25);
|
||||
this.cmbType.TabIndex = 0;
|
||||
|
||||
@@ -135,22 +135,24 @@ namespace Work._29Tools.Forms.UserForms
|
||||
data3 += "&user_name_in=" + oemUserNames;
|
||||
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if(cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31,32";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24,28,33,37,41";
|
||||
else if (cmbType.Text == "同步物流")
|
||||
data3 += "&type_in=55";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
@@ -229,29 +231,31 @@ namespace Work._29Tools.Forms.UserForms
|
||||
data3 += "&user_name_in=" + txtUserName.Text.Trim();
|
||||
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24";
|
||||
else if (cmbType.Text == "退货包裹扣费支出")
|
||||
data3 += "&type_in=26";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31";
|
||||
else if (!string.IsNullOrEmpty(cmbType.Text))
|
||||
data3 += "&type_in=" + cmbType.Text;
|
||||
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
data3 += "&page=" + ucSplitPage1.CurrentPage;
|
||||
if (cmbType.Text == "充值")
|
||||
data3 += "&type_in=1,30";
|
||||
else if (cmbType.Text == "管理员充值")
|
||||
data3 += "&type_in=1";
|
||||
else if (cmbType.Text == "支付宝充值")
|
||||
data3 += "&type_in=30";
|
||||
else if (cmbType.Text == "礼物单支出/礼物单退费")
|
||||
data3 += "&type_in=16,34";
|
||||
else if (cmbType.Text == "拍单扣除/作废返还")
|
||||
data3 += "&type_in=20,23";
|
||||
else if (cmbType.Text == "退货包裹扣费支出/返还")
|
||||
data3 += "&type_in=26,38";
|
||||
else if (cmbType.Text == "额外包裹扣费支出/返还")
|
||||
data3 += "&type_in=35,36";
|
||||
else if (cmbType.Text == "云仓退货扣费支出")
|
||||
data3 += "&type_in=31,32";
|
||||
else if (cmbType.Text == "超重扣费支出")
|
||||
data3 += "&type_in=24,28,33,37,41";
|
||||
else if (cmbType.Text == "同步物流")
|
||||
data3 += "&type_in=55";
|
||||
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
|
||||
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
|
||||
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
|
||||
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
|
||||
data3 += "&page=" + ucSplitPage1.CurrentPage;
|
||||
data3 += "&page_size=" + ucSplitPage1.PageSize;
|
||||
pageSize = ucSplitPage1.PageSize;
|
||||
}));
|
||||
|
||||
Reference in new issue
Block a user