From caba307ed1fcf59c8fa1b07dd71f2aadd809588f Mon Sep 17 00:00:00 2001 From: wule Date: Wed, 1 Jul 2026 20:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96web=E6=9F=A5=E8=AF=A2=20=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=A6=E5=91=98=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=B0=9D=E8=AF=9564=E4=BD=8D=E8=BD=AF=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/AllBase.csproj | 6 +- AllBase/BaseClass.cs | 4 +- AllBase/Model/Result/KJDDBProduct.cs | 14 +- DllReference/NaiBa.CefHelper.x64.138.dll | Bin 0 -> 61440 bytes .../BLL/BXX/BXXProductManage.cs | 700 +++--------------- .../KJD_WebService/BLL/KJD/UpdateManage.cs | 14 +- .../KJD_WebService/BLL/WXXD/WXOrderManage.cs | 44 ++ .../BLL/WXXD/WXProductManage.cs | 157 ---- .../KJD_WebService/BXXProductService.asmx.cs | 97 --- .../KJD_WebService/KJD_WebService.csproj.user | 2 +- .../Model/DBProductResultParam.cs | 6 +- .../KJD_WebService/WXOrderService.asmx.cs | 16 +- PackTools/package260701wx x64.nsi | 48 +- TEMUKJD CEFv138.sln | 29 +- TEMUKJD/ChangeForm.cs | 53 +- TEMUKJD/ChangeForm.designer.cs | 31 +- TEMUKJD/KJD.csproj | 27 +- .../KJDForms/AdminForms/AdminCardCodeForm.cs | 2 +- .../PDDDBProdEditForm.Designer.cs | 109 +-- .../ProductSelectForms/PDDDBProdEditForm.cs | 164 ---- .../ProductSelectForms/PDDDBProdListForm.cs | 89 ++- .../ProductSelectForms/PDDDBProdUploadForm.cs | 6 - ...PDDDBProdUploadSelectCacheForm.Designer.cs | 16 +- .../PDDDBProdUploadSelectCacheForm.cs | 5 + .../PDDDBProdUploadSelectCacheForm.resx | 3 + .../ShopForms/PDDShopBrowserObject.cs | 165 ----- .../PDDForms/ShopForms/PDDShopLoginForm.cs | 41 - TEMUKJD/Resources/choice_buyer_blast.png | Bin 6505 -> 4818 bytes TEMUKJD/Resources/choice_buyer_blast_old.png | Bin 0 -> 6505 bytes .../ToolForms/DouBaoTitleFissionCefForm.cs | 1 - .../AdminForms/WXAdminAccountForm.Designer.cs | 30 +- .../WXForms/AdminForms/WXAdminAccountForm.cs | 4 + .../ProductForms/WXDBProdUploadForm.cs | 67 +- .../WXProdPreSaleForm.Designer.cs | 295 +++++--- .../WXForms/ProductForms/WXProdPreSaleForm.cs | 113 ++- .../ProductForms/WXSelectDBProdListForm.cs | 1 - .../WXUserCollectAuthProdListForm.cs | 1 - .../WXForms/ShopForms/WXPDDShopLoginForm.cs | 41 - .../ShopForms/WXShopListForm.Designer.cs | 65 +- TEMUKJD/WXForms/ShopForms/WXShopListForm.cs | 3 +- .../WXSubAccountListForm.Designer.cs | 2 +- .../WXForms/ShopForms/WXSubAccountListForm.cs | 1 + Work/Initialization.cs | 30 - Work/Work.csproj | 5 +- 44 files changed, 738 insertions(+), 1769 deletions(-) create mode 100644 DllReference/NaiBa.CefHelper.x64.138.dll create mode 100644 TEMUKJD/Resources/choice_buyer_blast_old.png diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 747b2a4..91bb89e 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -65,7 +65,7 @@ DEBUG;TRACE true full - x86 + x64 false prompt MinimumRecommendedRules.ruleset @@ -85,7 +85,7 @@ true - bin\x64\Debug\ + ..\bin\ DEBUG;TRACE true full @@ -97,7 +97,7 @@ false - bin\x64\Release\ + ..\bin\ true true pdbonly diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 7a2b7f2..bcc859c 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1195; + public static int VersionCount = 1200; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; @@ -126,7 +126,7 @@ namespace AllBase public static decimal MinPrice = 0; public static decimal MinBackMoney = 0; public static decimal Price = 5; - public static int TimeOut = 30; + public static int TimeOut = 45; public static int ThreadCount = 3; public static int MainCatId = 0; /// diff --git a/AllBase/Model/Result/KJDDBProduct.cs b/AllBase/Model/Result/KJDDBProduct.cs index 4a0fb10..1f12e6e 100644 --- a/AllBase/Model/Result/KJDDBProduct.cs +++ b/AllBase/Model/Result/KJDDBProduct.cs @@ -56,8 +56,17 @@ namespace AllBase.Model.Result public string sku_edit_json { get; set; } public string sku_secret_json { get; set; } public string wx_img_map_json { get; set; } - public int sku_img_replace_id { get; set; } + /// + /// 数据库商品的 替换图片id（拼多多用）， 功能已废弃，代码暂时未移除 + /// + public int? sku_img_replace_id { get; set; } + /// + /// 数据库商品的 替换图片base64编码（拼多多用）， 功能已废弃，代码暂时未移除 + /// public string sku_img_replace_base64 { get; set; } + /// + /// 数据库商品的 替换图片url（拼多多用），目前用作临时变量 + /// public string sku_img_replace_url { get; set; } public string main_img { get; set; } public DateTime add_time { get; set; } @@ -68,6 +77,9 @@ namespace AllBase.Model.Result /// （某个店铺）上传次数 /// public int select_count { get; set; } + /// + /// temu 商品选品记录 + /// public int select_total_count { get; set; } /// /// Temu 采集来源 0母店采集 1前端直采 diff --git a/DllReference/NaiBa.CefHelper.x64.138.dll b/DllReference/NaiBa.CefHelper.x64.138.dll new file mode 100644 index 0000000000000000000000000000000000000000..2bbdcbc1b69c45e643dca40bbe3bc3fe6ac96bb9 GIT binary patch literal 61440 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�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 100000) @@ -121,7 +123,12 @@ namespace KJD_Web.BLL.BXX sql = "INSERT INTO bxx.product("; sql += "from_shop_id,from_shop_name,offline_supplier_id,offline_supplier_name,spu_id,skc_id,real_coid,real_spu_id,main_cat_id,main_cat_name,cat_id,"; - sql += "cat_name,price_text,product_name,ext_code,main_img,product_json,size_json,notes,product_get_type,sale_count,sale_count_text,special_prod_type,"; + sql += "cat_name,price_text,product_name,ext_code,main_img,product_json,size_json,notes,product_get_type,"; + if (sale_count != null) + { + sql += "sale_count,"; + } + sql += "sale_count_text,special_prod_type,"; sql += "distribution_set,ban_wx,ban_pdd,add_time,mdy_time,"; if (add_user_name != null) sql += "add_user_name,"; @@ -133,8 +140,12 @@ namespace KJD_Web.BLL.BXX sql += ") "; sql += "values ('" + from_shop_id + "','" + from_shop_name + "','" + offline_supplier_id + "','" + offline_supplier_name + "','" + spu_id + "','" + skc_id + "','" + real_coid + "','" + real_spu_id + "','" + main_cat_id + "','" + main_cat_name + "','" + cat_id + "','" + cat_name + "','" + - price_text + "','" + product_name + "','" + ext_code + "','" + main_img + "',@product_json,@size_json,'" + notes + "','" + product_get_type + "','" + - sale_count + "','" + sale_count_text + "','" + special_prod_type + "'," + distribution_set.ParseToInt() + "," + ban_wx + "," + ban_pdd + ","; + price_text + "','" + product_name + "','" + ext_code + "','" + main_img + "',@product_json,@size_json,'" + notes + "','" + product_get_type + "',"; + if (sale_count != null) + { + sql += "'" + sale_count + "',"; + } + sql += "'" + sale_count_text + "','" + special_prod_type + "'," + distribution_set.ParseToInt() + "," + ban_wx + "," + ban_pdd + ","; sql += "'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; sql += "'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; if (add_user_name != null) @@ -594,11 +605,10 @@ namespace KJD_Web.BLL.BXX var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'"); var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'"); if (special_prod_type.IsNullOrEmpty()) - special_prod_type = "普通商品,书籍"; + special_prod_type = "普通商品"; var is_supplier_prod_ok = RegexUtils.GetStringQuery(ref inputData, "is_supplier_prod_ok")?.Replace("'", "\\'"); var has_wx_cat = RegexUtils.GetStringQuery(ref inputData, "has_wx_cat")?.Replace("'", "\\'"); var send_to_out_server = RegexUtils.GetStringQuery(ref inputData, "send_to_out_server")?.Replace("'", "\\'"); - var has_send_to_out_server = RegexUtils.GetStringQuery(ref inputData, "has_send_to_out_server")?.Replace("'", "\\'"); var real_coid = RegexUtils.GetStringQuery(ref inputData, "real_coid")?.Replace("'", "\\'"); var has_wx_format = RegexUtils.GetStringQuery(ref inputData, "has_wx_format")?.Replace("'", "\\'"); var problem_prod_data = RegexUtils.GetStringQuery(ref inputData, "problem_prod_data")?.Replace("'", "\\'"); @@ -622,14 +632,11 @@ namespace KJD_Web.BLL.BXX List paramLst = new List(); string sql = " select count(*) from bxx.product p "; - //if (!string.IsNullOrEmpty(wx_safe_status)) - // sql += " FORCE INDEX (index_wx_safe_status) "; //sql += " LEFT JOIN bxx.jst_supplier_ban_platform b ON (p.skc_id=b.coid or p.real_coid=b.coid)" + sql += " WHERE p.is_del=0"; string where = ""; - //where += " AND (b.ban_wx IS NULL OR b.ban_wx=0)"; if (!string.IsNullOrEmpty(from_shop_id)) where += " and p.from_shop_id ='" + from_shop_id + "'"; if (!string.IsNullOrEmpty(from_shop_name)) @@ -644,21 +651,7 @@ namespace KJD_Web.BLL.BXX where += " and p.product_get_type in ('" + product_get_type.Replace(",", "','") + "')"; if (!string.IsNullOrEmpty(wx_safe_status)) where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')"; - //if (!string.IsNullOrEmpty(wx_safe_status)) - //{ - // where += " and ("; - // var index = 0; - // foreach (var status in wx_safe_status.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) - // { - // index++; - // if (index == 1) - // where += " p.wx_safe_status='" + status + "'"; - // else - // where += " or p.wx_safe_status='" + status + "'"; - // } - // where += ") "; - //} - if (!string.IsNullOrEmpty(special_prod_type)/* && special_prod_type != "普通商品,书籍,爆款数据"*/) + if (!string.IsNullOrEmpty(special_prod_type)/* && special_prod_type != "普通商品,爆款数据"*/) where += " and p.special_prod_type in ('" + special_prod_type.Replace(",", "','") + "')"; if (!string.IsNullOrWhiteSpace(search_spu)) @@ -669,13 +662,13 @@ namespace KJD_Web.BLL.BXX where += " and p.spu_id like '" + search_spu + "%'"; } if (!string.IsNullOrWhiteSpace(search_skc)) - where += " and p.skc_id like '%" + search_skc + "%'"; + where += " and p.skc_id like '" + search_skc + "%'"; if (!string.IsNullOrWhiteSpace(search_cat)) - where += " and p.cat_name like '%" + search_cat + "%'"; + where += " and p.cat_name like '" + search_cat + "%'"; if (!string.IsNullOrWhiteSpace(search_cat1)) - where += " and p.main_cat_name like '%" + search_cat1 + "%'"; + where += " and p.main_cat_name like '" + search_cat1 + "%'"; if (!string.IsNullOrWhiteSpace(search_ext_code)) - where += " and p.ext_code like '%" + search_ext_code + "%'"; + where += " and p.ext_code like '" + search_ext_code + "%'"; if (!string.IsNullOrWhiteSpace(search_prod_name)) { var searchProdNameWords = search_prod_name.Split(new string[] { ",", "，", ";", "；", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); @@ -701,10 +694,10 @@ namespace KJD_Web.BLL.BXX if (search_group == "无分组") where += " and (p.group is null or p.group = '')"; else - where += " and p.group like '%" + search_group + "%'"; + where += " and p.group like '" + search_group + "%'"; } if (!string.IsNullOrWhiteSpace(search_notes)) - where += " and p.notes like '%" + search_notes + "%'"; + where += " and p.notes like '" + search_notes + "%'"; if (!string.IsNullOrWhiteSpace(wx_cat_1)) where += " and p.wx_cat_1 in (" + wx_cat_1 + ")"; @@ -717,25 +710,13 @@ namespace KJD_Web.BLL.BXX if (!string.IsNullOrEmpty(has_wx_cat)) { - //if (has_wx_cat.ToLower() == "true") - // where += " and wx_cat_leaf is NOT NULL and wx_cat_3 IS NOT NULL"; - //else - // where += " and (wx_cat_leaf is NULL OR wx_cat_3 IS NULL)"; - if (has_wx_cat.ToLower() == "true") - where += " and wx_cat_3 IS NOT NULL"; + where += " and p.wx_cat_3 >= 0"; else - where += " and wx_cat_3 IS NULL"; + where += " and p.wx_cat_3 IS NULL"; } if (!string.IsNullOrEmpty(send_to_out_server)) - where += " and send_to_out_server=" + send_to_out_server; - else if (!string.IsNullOrEmpty(has_send_to_out_server)) - { - if (has_send_to_out_server.ToLower() == "true") - where += " and send_to_out_server=1"; - else - where += " and send_to_out_server!=1"; - } + where += " and p.send_to_out_server in (" + send_to_out_server + ")"; // 供应商货源是否已完成初始设置 if (!string.IsNullOrEmpty(is_supplier_prod_ok)) { @@ -744,17 +725,26 @@ namespace KJD_Web.BLL.BXX //else // where += " and (wx_cat_leaf IS NULL or send_to_out_server=0 or delivery_fee_set=0 or after_sale_set=0 or distribution_set=0)"; if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "是" || is_supplier_prod_ok == "已设置") - where += " and wx_cat_leaf IS NOT NULL and send_to_out_server IN (1,127) and distribution_set IN (1,127)"; + where += " and p.wx_cat_3 IS NOT NULL and p.send_to_out_server IN (1,127) and p.distribution_set IN (1,127)"; else - where += " and (wx_cat_leaf IS NULL or send_to_out_server NOT IN (1,127) or distribution_set NOT IN (1,127))"; + where += " and (p.wx_cat_3 IS NULL or p.send_to_out_server NOT IN (1,127) or p.distribution_set NOT IN (1,127))"; } + if (!where.Contains("send_to_out_server")) + { + //where += " and p.send_to_out_server IN (0,1,127)"; + } + if (!where.Contains("distribution_set")) + { + //where += " and p.distribution_set IN (0,1,2,127)"; + } + if (!string.IsNullOrEmpty(real_coid)) { - where += " and real_coid='" + real_coid + "'"; + where += " and p.real_coid='" + real_coid + "'"; } if (!string.IsNullOrEmpty(has_wx_format)) { - where += " and has_wx_format='" + has_wx_format + "'"; + where += " and p.has_wx_format='" + has_wx_format + "'"; } if (!string.IsNullOrEmpty(problem_prod_data)) { @@ -798,11 +788,6 @@ namespace KJD_Web.BLL.BXX } sql += where; - if (sql.Contains("15288888888")) - { - - } - var count = 0; if (isDetail || is_not_count) count = 1; @@ -818,54 +803,19 @@ namespace KJD_Web.BLL.BXX { if (isDetail) sql = " SELECT p.*" + - //" ,s.img_base64" + - //" ,s.img_url" + - //" ,e.ext_code_price" + " from bxx.product p" + - //" LEFT JOIN bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" + - //" LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - //" LEFT JOIN bxx.jst_supplier_ban_platform b ON (p.skc_id=b.coid or p.real_coid=b.coid)" + - " where p.is_del=0"; - else if (string.IsNullOrEmpty(get_select_count)) - sql = "select p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name," + - " p.main_img,p.notes,p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group," + - " p.product_get_type,p.wx_safe_status,p.sale_count,p.sale_count_text,p.special_prod_type,p.from_shop_name,p.wx_cat_1,p.wx_cat_2,p.wx_cat_3," + - " p.wx_cat_leaf,p.send_to_out_server,p.secret_spu_id,p.real_coid,p.real_spu_id,p.is_relation,p.view_uv,p.add_user_name" + - //" ,s.img_url," + - //" e.ext_code_price" + - " FROM bxx.product p " + - //" LEFT JOIN bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" + - //" LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - //" LEFT JOIN bxx.jst_supplier_ban_platform b ON (p.skc_id=b.coid or p.real_coid=b.coid)" + " where p.is_del=0"; else sql = "SELECT p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name," + - " p.main_img,p.notes,p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group," + + " p.main_img,p.notes,p.add_time,p.mdy_time,p.fission_words,p.head_words,p.end_words,p.group," + " p.product_get_type,p.wx_safe_status,p.sale_count,p.sale_count_text,p.special_prod_type,p.from_shop_name,p.wx_cat_1,p.wx_cat_2,p.wx_cat_3," + " p.wx_cat_leaf,p.send_to_out_server,p.secret_spu_id,p.real_coid,p.real_spu_id,p.is_relation,p.view_uv,p.add_user_name" + - //" ,s.img_url" + - //" ,e.ext_code_price," + - //" COUNT(se.id) AS select_count" + " FROM bxx.product p" + - //" LEFT JOIN bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" + - //" LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - //" LEFT JOIN bxx.product_select se ON p.id=se.out_product_id AND se.shop_id='" + select_shop_id + "' " + " WHERE p.is_del=0"; - //where子句 sql += where; - if (sql.Contains("15288888888")) - { - - } - - - if (!isDetail && !string.IsNullOrEmpty(get_select_count)) - sql += " group by p.id"; - if (sort_field == "select_total_count") - sql += " order by p.select_total_count desc, p.id desc"; - else if (sort_field == "view_uv") + if (sort_field == "view_uv") sql += " order by p.view_uv desc, p.id desc"; else sql += " order by p.id desc"; @@ -907,12 +857,10 @@ namespace KJD_Web.BLL.BXX mdy_time = Convert.ToDateTime(row["mdy_time"]), notes = row["notes"].ToString(), group = row["group"].ToString(), - select_total_count = row["select_total_count"].ParseToInt(), + //select_total_count = row["select_total_count"].ParseToInt(), end_words = row["end_words"].ParseToString(), fission_words = row["fission_words"].ParseToString(), head_words = row["head_words"].ParseToString(), - sku_img_replace_id = row["sku_img_replace_id"].ParseToInt(), - //sku_img_replace_url = row["img_url"].ToString(), product_get_type_text = row["product_get_type"].ToString(), view_uv = row["view_uv"].ParseToNullableInt(), sale_count = row["sale_count"].ParseToInt(), @@ -936,8 +884,6 @@ namespace KJD_Web.BLL.BXX prod.sku_secret_json = row["sku_secret_json"].ToString(); prod.fission_imgs = row["fission_imgs"].ToString(); prod.has_wx_format = row["has_wx_format"].ParseToNullableString(); // 微信回采 - //prod.sku_img_replace_base64 = row["img_base64"].ToString(); - //prod.sku_img_replace_url = row["img_url"].ToString(); prod.wx_img_map_json = row["wx_img_map_json"].ToString(); problem_prod_data = row["problem_prod_data"].IsNullOrEmpty() ? null : row["problem_prod_data"].ParseToString(); @@ -1733,11 +1679,18 @@ namespace KJD_Web.BLL.BXX var wx_cat_1 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_1")?.Replace("'", "\\'"); var wx_cat_2 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_2")?.Replace("'", "\\'"); var wx_cat_3 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_3")?.Replace("'", "\\'"); - var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'"); var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'"); var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'"); if (special_prod_type.IsNullOrEmpty()) - special_prod_type = "普通商品,书籍"; + special_prod_type = "普通商品"; + var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'"); + var is学员数据 = false; + if (product_get_type == "学员数据") + { + is学员数据 = true; + product_get_type = "多多外部数据,微信小店,微信店采"; + special_prod_type = "普通商品,爆款数据"; + } var is_supplier_prod_ok = RegexUtils.GetStringQuery(ref inputData, "is_supplier_prod_ok")?.Replace("'", "\\'"); var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") == "true"; // 不计数 var prod_count = RegexUtils.GetStringQuery(ref inputData, "prod_count").ParseToInt(); @@ -1747,6 +1700,8 @@ namespace KJD_Web.BLL.BXX var ban_wx = RegexUtils.GetStringQuery(ref inputData, "ban_wx")?.Replace("'", "\\'"); var ban_pdd = RegexUtils.GetStringQuery(ref inputData, "ban_pdd")?.Replace("'", "\\'"); var add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'"); + if (is学员数据) + add_user_name = "admin"; var no_fission_words = RegexUtils.GetStringQuery(ref inputData, "no_fission_words").ParseToBool(); // 未裂变标题 var fission_words = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "fission_words"))?.Replace("'", "\\'"); @@ -1806,22 +1761,37 @@ namespace KJD_Web.BLL.BXX { where += " and p.wx_cat_3 in (" + wx_cat_3 + ")"; } + string where1 = ""; + string where2 = ""; if (!string.IsNullOrEmpty(product_get_type)) - where += " and p.product_get_type in ('" + product_get_type.Replace(",", "','") + "')"; + { + where1 = " and p.product_get_type in ('" + product_get_type.Replace(",", "','") + "')"; + if (is学员数据) + { + // 多多外部数据20% 微信小店数据30% 微信店采50% + //where2 = " and (RAND() < 0.066 AND product_get_type = '多多外部数据' OR RAND() < 0.3 AND product_get_type = '微信小店' OR RAND() <= 1 AND product_get_type = '微信店采') "; + where2 = " and (RAND() < 0.055 AND product_get_type = '多多外部数据' OR RAND() < 0.39 AND product_get_type = '微信小店' OR RAND() <= 1 AND product_get_type = '微信店采') "; + } + where += where1; + } if (!string.IsNullOrEmpty(wx_safe_status)) where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')"; //if (!string.IsNullOrEmpty(special_prod_type)) // 普通商品 爆款数据 // where += " and p.special_prod_type ='" + special_prod_type + "'"; - if (!string.IsNullOrEmpty(special_prod_type)/* && special_prod_type != "普通商品,书籍,爆款数据"*/) + if (!string.IsNullOrEmpty(special_prod_type)/* && special_prod_type != "普通商品,爆款数据"*/) where += " and p.special_prod_type in ('" + special_prod_type.Replace(",", "','") + "')"; // 供应商货源是否已完成初始设置 if (!string.IsNullOrEmpty(is_supplier_prod_ok)) { if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "是" || is_supplier_prod_ok == "已设置") - where += " AND wx_cat_leaf IS NOT NULL AND send_to_out_server IN (1,127) and distribution_set IN (1,127)"; + where += " AND wx_cat_leaf > 0 AND send_to_out_server IN (1,127) and distribution_set IN (1,127)"; else where += " AND (wx_cat_leaf IS NULL OR send_to_out_server NOT IN (1,127) OR distribution_set NOT IN (1,127))"; } + else + { + where += " AND send_to_out_server IN (0,1,127) and distribution_set IN (0,1,2,127)"; + } if (!add_days_less.IsNullOrZero()) { where += " and add_time > '" + DateTime.Now.AddDays(-add_days_less.ParseToInt()).ToString("yyyy-MM-dd") + "'"; @@ -1838,10 +1808,18 @@ namespace KJD_Web.BLL.BXX { where += " and p.ban_wx=" + ban_wx; } + else + { + where += " and p.ban_wx in (0,1) "; + } if (ban_pdd != null) { where += " and p.ban_pdd=" + ban_pdd; } + else + { + where += " and p.ban_pdd in (0,1) "; + } if (!string.IsNullOrEmpty(add_user_name)) { add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; @@ -1857,11 +1835,13 @@ namespace KJD_Web.BLL.BXX } sql += where; - int count = prod_count; + int count = prod_count; if (product_get_type == "厂商直采" && count > 1000) count = (count / 2.0).ParseToInt(); + if (is学员数据 && count >= 450) + count = (count / 3.0).ParseToInt(); if (!is_not_count) - { + { count = mySql.ExecuteRowCount(sql); Thread.Sleep(1500); } @@ -1873,6 +1853,11 @@ namespace KJD_Web.BLL.BXX } else { + if (is学员数据) + { + where = where.Replace(where1, where2); + } + sql = " SELECT p.id" + " FROM bxx.product p" + //" LEFT JOIN bxx.jst_supplier_ban_platform b ON (p.skc_id=b.coid OR p.real_coid=b.coid)" + @@ -1956,6 +1941,8 @@ namespace KJD_Web.BLL.BXX var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000"); if (product_get_type == "厂商直采" && count > 500) count = (count * 2.0).ParseToInt(); + if (is学员数据 && count >= 150) + count = (count * 3.0).ParseToInt(); return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}"; } catch (Exception ex) @@ -2264,7 +2251,6 @@ namespace KJD_Web.BLL.BXX string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name"); string img_md5 = RegexUtils.GetStringQuery(ref inputData, "img_md5"); string img_base64 = RegexUtils.GetStringQuery(ref inputData, "img_base64"); - //string product_db_id = RegexUtils.GetStringQuery(ref inputData, "product_db_id"); string img_url = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "img_url")); string img_type = RegexUtils.GetStringQuery(ref inputData, "img_type")?.Replace("'", "\\'"); string img_group = RegexUtils.GetStringQuery(ref inputData, "img_group")?.Replace("'", "\\'"); @@ -2274,7 +2260,6 @@ namespace KJD_Web.BLL.BXX return "{\"code\":500,\"msg\":\"没有用户名\"}"; } - //int sku_img_replace_id = 0; string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); string sql = ""; @@ -2290,10 +2275,6 @@ namespace KJD_Web.BLL.BXX } if (rst > 0) { - //sku_img_replace_id = (int)rst; - //sql = "update bxx.product set sku_img_replace_id= "+ sku_img_replace_id + " where id=" + product_db_id + ";"; - - //bRst = mySql.ExecuteNonQuery(sql); bRst = true; } mySql.Close(); @@ -2307,40 +2288,6 @@ namespace KJD_Web.BLL.BXX return "{\"code\":19999,\"msg\":\"输入为空\"}"; } - public string MdyProdSkuImgReplaceId(string inputData) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = 0; - int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name"); - string product_db_id = RegexUtils.GetStringQuery(ref inputData, "product_db_id"); - string img_db_id = RegexUtils.GetStringQuery(ref inputData, "img_db_id"); - - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":500,\"msg\":\"没有用户名\"}"; - } - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = ""; - - sql = "update bxx.product set sku_img_replace_id= " + img_db_id + " where id=" + product_db_id + ";"; - - var bRst = mySql.ExecuteNonQuery(sql); - mySql.Close(); - if (bRst) - return "{\"code\":200,\"msg\":\"success\"}"; - return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - public string MdySkuImgReplace(string inputData) { if (!string.IsNullOrEmpty(inputData)) @@ -2450,473 +2397,6 @@ namespace KJD_Web.BLL.BXX } return "{\"code\":19999,\"msg\":\"输入为空\"}"; } - - /// - /// 添加用户选择商品 - /// - /// - /// - /// - public string AddUserSelectProduct(string inputData, bool isAdmin = false) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var out_product_Id = RegexUtils.GetStringQuery(ref inputData, "out_product_id")?.Replace("'", "\\'"); - var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'"); - var shop_account = RegexUtils.GetStringQuery(ref inputData, "shop_account")?.Replace("'", "\\'"); - var user_name = RegexUtils.GetStringQuery(ref inputData, "main_user_name")?.Replace("'", "\\'"); - var sub_user_name = RegexUtils.GetStringQuery(ref inputData, "sub_user_name")?.Replace("'", "\\'"); - var notes = RegexUtils.GetStringQuery(ref inputData, "notes")?.Replace("'", "\\'"); - var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); - var add_product_remaining = RegexUtils.GetStringQuery(ref inputData, "add_product_remaining").ParseToInt(); - var add_fission_product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_fission_product_name").ParseToString())?.Replace("'", "\\'"); - - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":500,\"msg\":\"没有用户名\"}"; - } - if (string.IsNullOrEmpty(shop_id)) - { - return "{\"code\":500,\"msg\":\"没有店铺信息\"}"; - } - - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = "insert into bxx.product_select " + - "(out_product_Id,shop_id,shop_account,user_name,sub_user_name,notes,status,fission_product_name,add_time,mdy_time) values " + - "('" + out_product_Id + "','" + shop_id + "','" + shop_account + "','" + user_name + "','" + sub_user_name + "','" + - notes + "','" + status + "','" + add_fission_product_name + "','" + - DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + - DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; - if (add_product_remaining > 0) - { - add_product_remaining = add_product_remaining - 1; - sql += "\r\n"; - //sql += "update bxx.shop set add_product_remaining=" + add_product_remaining + " where shop_id='" + shop_id + "';"; - sql += "update bxx.product set select_total_count=select_total_count+1 where id=" + out_product_Id + ";"; - //sql += "update bxx.shop_add_prod_count set add_product_remaining=" + add_product_remaining + " where shop_id='" + shop_id + "';"; - sql += "INSERT INTO bxx.shop_add_prod_count(shop_id, add_product_remaining) VALUES('" + shop_id + "'," + add_product_remaining + ")" + - "ON DUPLICATE KEY UPDATE add_product_remaining=VALUES(add_product_remaining)"; - } - var rst = mySql.ExecuteNonQuery(sql); - mySql.Close(); - if (rst) - { - return "{\"code\":200,\"msg\":\"success\"}"; - } - else - { - return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; - } - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - public string MdyUserSelectProductStatus(string inputData, bool isAdmin = false) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); - var draft_id = RegexUtils.GetStringQuery(ref inputData, "draft_id")?.Replace("'", "\\'"); - var up_spu_id = RegexUtils.GetStringQuery(ref inputData, "up_spu_id")?.Replace("'", "\\'"); - var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'"); - var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); - var add_times = RegexUtils.GetStringQuery(ref inputData, "add_times")?.Replace("'", "\\'"); - - long l_draft_id = draft_id.ParseToLong(); - long l_spu_map_table_id = l_draft_id % 128; - long l_select_map_table_id = id.ParseToLong() % 64; - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = ""; - // 使用事务一次提交多个sql操作 - //sql += "set @@autocommit=0;\r\n"; - sql += "START TRANSACTION;\r\n"; - if (!string.IsNullOrEmpty(up_spu_id) && !string.IsNullOrEmpty(draft_id)) - { - sql += "insert into kjd_map.spu_map_" + l_spu_map_table_id + - " (draft_id,from_spu_id,shop_id) values(" + draft_id + "," + up_spu_id + ",'" + shop_id + "');\r\n"; - // temu商品反复上传后记录一件选品商品上传的所有DraftId记录，pdd不需要 - //sql += "insert into kjd_map.product_select_map_" + l_select_map_table_id + - // " (product_id,product_select_db_id,shop_id) values(" + draft_id + "," + id + ",'" + shop_id + "');\r\n"; - } - sql += "update bxx.product_select set"; - if (draft_id != null) - sql += " draft_id='" + draft_id + "',"; - if (status != null) - sql += " status='" + status + "',"; - if (status == "已上传") - sql += " add_times=add_times+1,"; - sql += " mdy_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; - sql = sql.TrimEnd(','); - sql += " where id=" + id + ";\r\n"; - var rst = mySql.ExecuteNonQuery(sql); - string errMsg = mySql.Message; - if (string.IsNullOrEmpty(errMsg)) - sql = "COMMIT;"; - else - sql = "ROLLBACK;"; - mySql.ExecuteNonQuery(sql); - mySql.Close(); - if (rst) - { - return "{\"code\":200,\"msg\":\"success\"}"; - } - else - { - return "{\"code\":500,\"msg\":\"" + errMsg + "\"}"; - } - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - public string GetUserSelectProductList(string inputData, bool isAdmin = false) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":500,\"msg\":\"没有用户名\"}"; - } - - var shop_ids = RegexUtils.GetStringQuery(ref inputData, "shop_ids")?.Replace("'", "\\'"); - var search_shop_id = RegexUtils.GetStringQuery(ref inputData, "search_shop_id")?.Replace("'", "\\'"); - var search_shop_account = RegexUtils.GetStringQuery(ref inputData, "search_shop_account")?.Replace("'", "\\'"); - var search_spu = RegexUtils.GetStringQuery(ref inputData, "search_spu")?.Replace("'", "\\'"); - var search_skc = RegexUtils.GetStringQuery(ref inputData, "search_skc")?.Replace("'", "\\'"); - var search_cat1 = RegexUtils.GetStringQuery(ref inputData, "search_cat1")?.Replace("'", "\\'"); - var search_cat = RegexUtils.GetStringQuery(ref inputData, "search_cat")?.Replace("'", "\\'"); - var search_ext_code = RegexUtils.GetStringQuery(ref inputData, "search_ext_code")?.Replace("'", "\\'"); - var search_prod_name = RegexUtils.GetStringQuery(ref inputData, "search_prod_name")?.Replace("'", "\\'"); - var search_notes = RegexUtils.GetStringQuery(ref inputData, "search_notes")?.Replace("'", "\\'"); - var search_user_notes = RegexUtils.GetStringQuery(ref inputData, "search_user_notes")?.Replace("'", "\\'"); - var search_db_ids = RegexUtils.GetStringQuery(ref inputData, "search_db_ids")?.Replace("'", "\\'"); - var search_sub_sa_name = RegexUtils.GetStringQuery(ref inputData, "search_sub_sa_name")?.Replace("'", "\\'"); - var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); - var operate_sub_sa_name = RegexUtils.GetStringQuery(ref inputData, "operate_sub_sa_name")?.Replace("'", "\\'"); - - var no_sub_sa = RegexUtils.GetStringQuery(ref inputData, "no_sub_sa")?.Replace("'", "\\'"); - - int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); - int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - - string sql = "select count(s.id) from bxx.product_select s " + - "left join bxx.product p on s.out_product_id=p.id " + - "left join bxx.user u on s.operate_sub_sa_name=u.user_name " + - "where 1=1"; - - string where = ""; - if (!isAdmin) - where += " and (s.user_name='" + user_name + "' or s.sub_user_name like'%" + user_name + "%')"; - if (!string.IsNullOrEmpty(operate_sub_sa_name)) - { - where += " and s.operate_sub_sa_name = '" + operate_sub_sa_name + "'"; - } - if (no_sub_sa == "true") - where += " and s.operate_sub_sa_name is null"; - if (!string.IsNullOrEmpty(search_db_ids)) - where += " and s.id in (" + search_db_ids + ")"; - if (!string.IsNullOrEmpty(shop_ids)) - where += " and s.shop_id in (" + shop_ids + ")"; - if (!string.IsNullOrWhiteSpace(status)) - where += " and s.status = '" + status + "'"; - if (!string.IsNullOrWhiteSpace(search_shop_id)) - where += " and s.shop_id like '%" + search_shop_id + "%'"; - if (!string.IsNullOrWhiteSpace(search_shop_account)) - where += " and s.shop_account like '%" + search_shop_account + "%'"; - if (!string.IsNullOrWhiteSpace(search_notes)) - { - //核价成功 重复 核价成功（重复） - if (search_notes == "无备注") - where += " and s.notes = ''"; - else if (search_notes == "重复") - where += " and s.notes like '%重复%' and s.notes not like '%核价成功%' and s.notes not like '%核价通过%'"; - else if (search_notes == "核价成功") - where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes not like '%重复%'"; - else if (search_notes == "核价成功（重复）") - where += " and (s.notes like '%核价成功%' or s.notes like '%核价通过%') and s.notes like '%重复%'"; - else - where += " and s.notes like '%" + search_notes + "%'"; - } - if (!string.IsNullOrWhiteSpace(search_user_notes)) - where += " and s.user_notes like '%" + search_user_notes + "%'"; - - where += " and p.id_del=0"; - if (!string.IsNullOrWhiteSpace(search_spu)) - where += " and p.spu_id like '%" + search_spu + "%'"; - if (!string.IsNullOrWhiteSpace(search_skc)) - where += " and p.skc_id like '%" + search_skc + "%'"; - if (!string.IsNullOrWhiteSpace(search_cat1)) - where += " and p.main_cat_name like '%" + search_cat1 + "%'"; - if (!string.IsNullOrWhiteSpace(search_cat)) - where += " and p.cat_name like '%" + search_cat + "%'"; - if (!string.IsNullOrWhiteSpace(search_ext_code)) - where += " and p.ext_code like '%" + search_ext_code + "%'"; - if (!string.IsNullOrWhiteSpace(search_prod_name)) - where += " and p.product_name like '%" + search_prod_name + "%'"; - if (!string.IsNullOrEmpty(search_sub_sa_name)) - { - where += " and (s.operate_sub_sa_name like '%" + search_sub_sa_name + "%'"; - where += " or u.nick_name like '%" + operate_sub_sa_name + "%')"; - } - - sql += where; - - var count = mySql.ExecuteRowCount(sql); - - DataTable dt; - if (count == 0) - { - dt = new DataTable(); - } - else - { - //if (isDetail) - //sql = "select * from bxx.product_select where 1=1"; - //else - sql = "select s.id,s.out_product_id,s.shop_id,s.shop_account,s.user_name," + - "s.sub_user_name,s.notes,s.user_notes,s.status,s.draft_id,s.add_times,s.add_time,s.mdy_time," + - "s.fission_product_name,s.operate_sub_sa_name,s.add_sub_sa_time," + - "p.from_shop_id,p.spu_id,p.skc_id,p.cat_id,p.cat_name,p.ext_code,p.product_name,p.main_img,p.group" + - "u.nick_name as operate_sub_sa_nick " + - "from bxx.product_select s left join bxx.product p on s.out_product_id=p.id " + - "left join bxx.user u on u.user_name=s.operate_sub_sa_name " + - "where 1=1"; - - sql += where; // where子句 - - sql += " order by id desc"; - sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size; - dt = mySql.ExecuteDataTable(sql); - } - - mySql.Close(); - if (dt != null) - { - try - { - List productLst = new List(); - foreach (DataRow row in dt.Rows) - { - ProductSelectResultParam prodSelect = new ProductSelectResultParam() - { - id = row["id"].ParseToInt(), - out_product_Id = row["out_product_Id"].ParseToString(), - shop_account = row["shop_account"].ParseToString(), - shop_id = row["shop_id"].ParseToString(), - status = row["status"].ParseToString(), - sub_user_name = row["sub_user_name"].ParseToString(), - user_name = row["user_name"].ParseToString(), - cat_id = row["cat_id"].ParseToString(), - cat_name = row["cat_name"].ParseToString(), - product_name = row["product_name"].ParseToString(), - main_img = row["main_img"].ParseToString(), - group = row["group"].ToString(), - ext_code = row["ext_code"].ParseToString(), - add_time = Convert.ToDateTime(row["add_time"]), - mdy_time = Convert.ToDateTime(row["mdy_time"]), - notes = row["notes"].ParseToString(), - draft_id = row["draft_id"].ParseToString(), - add_times = row["add_times"].ParseToInt(), - skc_id = row["skc_id"].ToString(), - spu_id = row["spu_id"].ToString(), - operate_sub_sa_name = row["operate_sub_sa_name"].ToString(), - operate_sub_sa_nick = row["operate_sub_sa_nick"].ToString(), - fission_product_name = row["fission_product_name"].ToString(), - user_notes = row["user_notes"].ToString(), - from_shop_id = row["from_shop_id"].ToString(), - //product_json = row["product_json"].ToString(), - //size_json = row["size_json"].ToString(), - }; - prodSelect.add_sub_sa_time = row["add_sub_sa_time"] as DateTime?; - productLst.Add(prodSelect); - } - var data = JsonUtils.SerializeObjectToString(productLst); - return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}"; - } - catch (Exception ex) - { - return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}"; - } - } - else - { - return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}"; - } - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - public string DelSelectProd(string inputData) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":500,\"msg\":\"没有用户名\"}"; - } - - var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); - if (string.IsNullOrEmpty(id)) - { - return "{\"code\":500,\"msg\":\"删除失败：请指定要删除的数据！\"}"; - } - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = "delete from bxx.product_select where id='" + id + "'"; - - var rst = mySql.ExecuteNonQuery(sql); - mySql.Close(); - if (rst) - { - return "{\"code\":200,\"msg\":\"success\"}"; - } - else - return "{\"code\":500,\"msg\":\"删除失败：" + mySql.Message + "\"}"; - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - /// - /// 设置上传商品的二级超管 - /// - /// - public string SetSelectProductSubSa(string inputData) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":50001,\"msg\":\"没有用户名\"}"; - } - - var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); - var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'"); - var operate_sub_sa_name = RegexUtils.GetStringQuery(ref inputData, "operate_sub_sa_name")?.Replace("'", "\\'"); - var status = RegexUtils.GetStringQuery(ref inputData, "status")?.Replace("'", "\\'"); - - if (string.IsNullOrEmpty(id) && string.IsNullOrEmpty(shop_id)) - { - return "{\"code\":50002,\"msg\":\"未选择任何待上传\"}"; - } - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = "update bxx.product_select set"; - if (operate_sub_sa_name != null) - sql += " operate_sub_sa_name='" + operate_sub_sa_name + "',"; - sql += " add_sub_sa_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; - sql = sql.TrimEnd(','); - if (!string.IsNullOrEmpty(id)) - sql += " where id in (" + id + ")"; - else if (!string.IsNullOrEmpty(shop_id)) - sql += " where shop_id in ('" + shop_id.Replace(",","','") + "')"; - else - sql += " where 1=2"; - if(!string.IsNullOrEmpty(status)) - sql += " and status='" + status + "';"; - var rst = mySql.ExecuteNonQuery(sql); - mySql.Close(); - if (rst) - { - return "{\"code\":200,\"msg\":\"success\"}"; - } - else - { - return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; - } - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - public string MdyProductSelectNotes(string inputData, bool isAdmin = false) - { - if (!string.IsNullOrEmpty(inputData)) - { - var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - if (time1 != EncrypUtil.Encryption(time)) - return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name"); - var id = RegexUtils.GetStringQuery(ref inputData, "db_id"); - string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes")); - string user_notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "user_notes")); - string fission_product_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "fission_product_name")); - - if (string.IsNullOrEmpty(user_name)) - { - return "{\"code\":500,\"msg\":\"没有用户名\"}"; - } - - string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - MysqlUtils mySql = new MysqlUtils(conn); - string sql = "update bxx.product_select set"; - if (notes != null) - sql += " notes=@notes,"; - if (user_notes != null) - sql += " user_notes=@user_notes,"; - if (fission_product_name != null) - sql += " fission_product_name=@fission_product_name,"; - sql = sql.TrimEnd(','); - sql += " where id=@id;"; - - List paramLst = new List(); - paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "@id", Value = id, }); - paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@fission_product_name", Value = fission_product_name, }); - paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@user_notes", Value = user_notes, }); - paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@notes", Value = notes, }); - - var rst = mySql.ExecuteNonQuery(sql, paramLst.ToArray()); - mySql.Close(); - if (rst) - { - return "{\"code\":200,\"msg\":\"success\"}"; - } - else - { - return "{\"code\":500,\"msg\":\"更新失败：" + mySql.Message + "\"}"; - } - } - return "{\"code\":19999,\"msg\":\"输入为空\"}"; - } - - - public string WxApiGetWxAllCate(string inputData) { diff --git a/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs index dc29b16..0bb1118 100644 --- a/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs @@ -72,6 +72,12 @@ namespace KJD_Web.BLL var UpdateExeChk = System.Configuration.ConfigurationManager.ConnectionStrings["UpdateExeChk"].ConnectionString; var LowVersion = System.Configuration.ConfigurationManager.ConnectionStrings["LowVersion"].ConnectionString; + int MaxVersion = 999999; + //if (version <= 1198) + // MaxVersion = 1198; + if (version <= 1159) + MaxVersion = 1159; + if (version > LowVersion.ParseToInt()) { if (path != null) @@ -86,7 +92,7 @@ namespace KJD_Web.BLL foreach (var f in file) { var v = Path.GetFileName(f).Replace("Update29wx", "").Replace(".zip", "").ParseToInt(); - if (v > versionTmp && v <= serverVersion.ParseToInt()) + if (v > versionTmp && v <= serverVersion.ParseToInt() && v <= MaxVersion) { versionTmp = v; } @@ -105,7 +111,7 @@ namespace KJD_Web.BLL foreach (var f in file) { var v = Path.GetFileName(f).Replace("Update29pdd", "").Replace(".zip", "").ParseToInt(); - if (v > versionTmp && v <= serverVersion.ParseToInt()) + if (v > versionTmp && v <= serverVersion.ParseToInt() && v <= MaxVersion) { versionTmp = v; } @@ -124,8 +130,8 @@ namespace KJD_Web.BLL } } - if (serverVersion.ParseToInt() > 1159) - serverVersion = 1159.ToString(); + if (serverVersion.ParseToInt() > MaxVersion) + serverVersion = MaxVersion.ParseToString(); return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; } diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs index ccc47b2..fbe77ca 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs @@ -781,5 +781,49 @@ namespace KJD_Web.BLL.WXXD } return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + + /// + /// 修改中转仓订单信息，临时补救 + /// + /// + /// + public string WXUpdateErpAllocatedOrderNo(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!WXUserManage.GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + var timeCalc = DateTime.Now; + + int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); + int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200); + string out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'"); + string pre_allocated_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "pre_allocated_order_no"))?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(out_order_no)) + return "{\"code\":500,\"msg\":\"订单外部ID信息不能为空\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + + string sql = ""; + var count = -1; + + sql = " update `erp`.`oms_wei_external_procurement_log` set "; + if (!string.IsNullOrEmpty(pre_allocated_order_no)) + sql += " pre_allocated_order_no=" + pre_allocated_order_no + ","; + sql = sql.TrimEnd(','); + sql += " where out_order_no = '" + out_order_no + "';"; + + count = mySql.ExecuteAffectedRows(sql); + mySql.Close(); + + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}"; + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } } } \ No newline at end of file diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs index 2f14c45..6201563 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs @@ -23,163 +23,6 @@ namespace KJD_Web.BLL.WXXD public string WXGetPDDProductList(string inputData, bool isDetail = false) { return new BLL.BXX.BXXProductManage().GetProductList(inputData, isDetail); - - //if (!string.IsNullOrEmpty(inputData)) - //{ - // var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt(); - // string time1 = RegexUtils.GetStringQuery(ref inputData, "code"); - // if (time1 != EncrypUtil.Encryption(time)) - // return "{\"code\":50000,\"msg\":\"校验失败\"}"; - - // var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'","\\'"); - // var password = RegexUtils.GetStringQuery(ref inputData, "password")?.Replace("'", "\\'"); - // var search_spu = RegexUtils.GetStringQuery(ref inputData, "search_spu")?.Replace("'", "\\'"); - // var search_skc = RegexUtils.GetStringQuery(ref inputData, "search_skc")?.Replace("'", "\\'"); - // var search_cat = RegexUtils.GetStringQuery(ref inputData, "search_cat")?.Replace("'", "\\'"); - // var search_ext_code = RegexUtils.GetStringQuery(ref inputData, "search_ext_code")?.Replace("'", "\\'"); - // var search_prod_name = RegexUtils.GetStringQuery(ref inputData, "search_prod_name")?.Replace("'", "\\'"); - // var search_group = RegexUtils.GetStringQuery(ref inputData, "search_group")?.Replace("'", "\\'"); - // var search_notes = RegexUtils.GetStringQuery(ref inputData, "search_notes")?.Replace("'", "\\'"); - // var search_db_ids = RegexUtils.GetStringQuery(ref inputData, "search_db_ids")?.Replace("'", "\\'"); - // var get_select_count = RegexUtils.GetStringQuery(ref inputData, "get_select_count")?.Replace("'", "\\'"); - // var select_shop_id = RegexUtils.GetStringQuery(ref inputData, "select_shop_id")?.Replace("'", "\\'"); - // var from_shop_id = RegexUtils.GetStringQuery(ref inputData, "from_shop_id")?.Replace("'", "\\'"); - // var sort_field = RegexUtils.GetStringQuery(ref inputData, "sort_field")?.Replace("'", "\\'"); - - // int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); - // int page_size= RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); - - // string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; - // MysqlUtils mySql = new MysqlUtils(conn); - - // string sql = "select count(id) from bxx.product p where p.is_del=0"; - - // string where = ""; - // if (!string.IsNullOrWhiteSpace(search_spu)) - // where += " and p.spu_id like '%" + search_spu + "%'"; - // if (!string.IsNullOrWhiteSpace(search_skc)) - // where += " and p.skc_id like '%" + search_skc + "%'"; - // if (!string.IsNullOrWhiteSpace(search_cat)) - // where += " and p.cat_name like '%" + search_cat + "%'"; - // if (!string.IsNullOrWhiteSpace(search_ext_code)) - // where += " and p.ext_code like '%" + search_ext_code + "%'"; - // if (!string.IsNullOrWhiteSpace(search_prod_name)) - // where += " and p.product_name like '%" + search_prod_name + "%'"; - // if (!string.IsNullOrWhiteSpace(search_group)) - // where += " and p.group like '%" + search_group + "%'"; - // if (!string.IsNullOrWhiteSpace(search_notes)) - // where += " and p.notes like '%" + search_notes + "%'"; - // if (!string.IsNullOrEmpty(from_shop_id)) - // where += " and p.from_shop_id ='" + from_shop_id + "'"; - // if (!string.IsNullOrEmpty(search_db_ids)) - // where += " and p.id in (" + search_db_ids + ")"; - // sql += where; - - // var count = mySql.ExecuteRowCount(sql); - - // DataTable dt; - // if (count == 0) - // { - // dt = new DataTable(); - // } - // else - // { - // if (isDetail) - // sql = "select p.*,s.img_base64,s.img_url,e.ext_code_price from bxx.product p" + - // " left join bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" + - // " LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - // " where p.is_del=0"; - // else if (string.IsNullOrEmpty(get_select_count)) - // sql = "select p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name,p.main_img,p.notes," + - // " p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group,p.product_get_type,s.img_url,e.ext_code_price" + - // " FROM bxx.product p " + - // " left join bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" + - // " LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - // " where p.is_del=0"; - // else - // sql = "SELECT p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name,p.main_img,p.notes," + - // " p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group,p.product_get_type,s.img_url,COUNT(se.id) AS select_count," + - // " e.ext_code_price" + - // " FROM bxx.product p left join bxx.sku_img_replace s ON p.sku_img_replace_id=s.id LEFT JOIN bxx.product_select se ON p.id=se.out_product_id AND se.shop_id='" + select_shop_id + "' " + - // " LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" + - // " WHERE p.is_del=0"; - - // //where子句 - // sql += where; - - // if (!isDetail && !string.IsNullOrEmpty(get_select_count)) - // sql += " group by p.id"; - // if (sort_field == "select_total_count") - // sql += " order by p.select_total_count desc, p.id desc"; - // else - // sql += " order by p.id desc"; - // sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size; - // dt = mySql.ExecuteDataTable(sql); - // } - - // mySql.Close(); - // if (dt != null) - // { - // try - // { - // List productLst = new List(); - // foreach (DataRow row in dt.Rows) - // { - // DBProductResultParam prod = new DBProductResultParam - // { - // id = Convert.ToInt32(row["id"]), - // from_shop_id = row["from_shop_id"].ToString(), - // skc_id = row["skc_id"].ToString(), - // spu_id = row["spu_id"].ToString(), - // cat_id = row["cat_id"].ToString(), - // cat_name = row["cat_name"].ToString(), - // product_name = row["product_name"].ToString(), - // main_img = row["main_img"].ToString(), - // ext_code = row["ext_code"].ToString(), - // ext_code_price = row["ext_code_price"].IsNullOrEmpty() ? new int?() : row["ext_code_price"].ParseToInt(), - // price_text = row["price_text"].ToString(), - // //product_json = row["product_json"].ToString(), - // //size_json = row["size_json"].ToString(), - // add_time = Convert.ToDateTime(row["add_time"]), - // mdy_time = Convert.ToDateTime(row["mdy_time"]), - // notes = row["notes"].ToString(), - // group = row["group"].ToString(), - // select_total_count = row["select_total_count"].ParseToInt(), - // end_words = row["end_words"].ParseToString(), - // fission_words = row["fission_words"].ParseToString(), - // head_words = row["head_words"].ParseToString(), - // sku_img_replace_id = row["sku_img_replace_id"].ParseToInt(), - // sku_img_replace_url = row["img_url"].ToString(), - // product_get_type_text = row["product_get_type"].ToString(), - // }; - // if (isDetail) - // { - // prod.product_json = row["product_json"].ToString(); - // prod.size_json = row["size_json"].ToString(); - // prod.sku_edit_json = row["sku_edit_json"].ToString(); - // prod.sku_img_replace_base64 = row["img_base64"].ToString(); - // //prod.sku_img_replace_url = row["img_url"].ToString(); - // } - // if (!string.IsNullOrEmpty(get_select_count)) - // { - // prod.select_count = row["select_count"].ParseToInt(); - // } - // productLst.Add(prod); - // } - // var data = JsonUtils.SerializerObjectToString(productLst); - // return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}"; - // } - // catch (Exception ex) - // { - // return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}"; - // } - // } - // else - // { - // return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}"; - // } - //} - //return "{\"code\":19999,\"msg\":\"输入为空\"}"; } public string WXGetPDDProductGroups(string inputData) diff --git a/KJDService/KJD_WebService/BXXProductService.asmx.cs b/KJDService/KJD_WebService/BXXProductService.asmx.cs index b20a349..d0a5ef0 100644 --- a/KJDService/KJD_WebService/BXXProductService.asmx.cs +++ b/KJDService/KJD_WebService/BXXProductService.asmx.cs @@ -325,18 +325,6 @@ namespace KJD_Web Context.Response.End(); } - [WebMethod] - public void mdy_prod_sku_img_replace_id() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().MdyProdSkuImgReplaceId(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - [WebMethod] public void mdy_sku_img_replace() { @@ -385,91 +373,6 @@ namespace KJD_Web Context.Response.End(); } - [WebMethod] - public void add_user_select_product() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().AddUserSelectProduct(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - - [WebMethod] - public void mdy_user_select_product_status() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().MdyUserSelectProductStatus(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - - [WebMethod] - public void get_user_select_product_list() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().GetUserSelectProductList(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - - - [WebMethod] - public void admin_get_user_select_product_list() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().GetUserSelectProductList(jsontext, true); - - Context.Response.Write(result); - Context.Response.End(); - } - - [WebMethod] - public void del_select_product() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().DelSelectProd(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - - [WebMethod] - public void set_select_product_sub_sa() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().SetSelectProductSubSa(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - - [WebMethod] - public void mdy_product_select_notes() - { - string jsontext = GetRequestJsonString(); - - var result = jsontext; - result = new BXXProductManage().MdyProductSelectNotes(jsontext); - - Context.Response.Write(result); - Context.Response.End(); - } - [WebMethod] public void get_wx_tokens() { diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 4bcdc04..c789fae 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -1,4 +1,4 @@ - + true diff --git a/KJDService/KJD_WebService/Model/DBProductResultParam.cs b/KJDService/KJD_WebService/Model/DBProductResultParam.cs index 325ddc4..264167a 100644 --- a/KJDService/KJD_WebService/Model/DBProductResultParam.cs +++ b/KJDService/KJD_WebService/Model/DBProductResultParam.cs @@ -71,9 +71,9 @@ namespace KJD_Web.Model /// public string sku_secret_json { get; set; } public string wx_img_map_json { get; set; } - public int sku_img_replace_id { get; set; } - public string sku_img_replace_base64 { get; set; } - public string sku_img_replace_url { get; set; } + //public int sku_img_replace_id { get; set; } + //public string sku_img_replace_base64 { get; set; } + //public string sku_img_replace_url { get; set; } public string main_img { get; set; } public DateTime add_time { get; set; } public DateTime mdy_time { get; set; } diff --git a/KJDService/KJD_WebService/WXOrderService.asmx.cs b/KJDService/KJD_WebService/WXOrderService.asmx.cs index 4f889f0..5546b1c 100644 --- a/KJDService/KJD_WebService/WXOrderService.asmx.cs +++ b/KJDService/KJD_WebService/WXOrderService.asmx.cs @@ -128,7 +128,7 @@ namespace KJD_Web } /// - /// 获取中转仓订单信息 + /// 修改中转仓物流信息 /// [WebMethod] public void wx_update_erp_order_express() @@ -138,6 +138,20 @@ namespace KJD_Web var result = jsontext; result = new WXOrderManage().WXUpdateErpOrderExpress(jsontext); + Context.Response.Write(result); + Context.Response.End(); + } + /// + /// 修改中转仓取号状态 + /// + [WebMethod] + public void wx_update_erp_allocated_order_no() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXOrderManage().WXUpdateErpAllocatedOrderNo(jsontext); + Context.Response.Write(result); Context.Response.End(); } diff --git a/PackTools/package260701wx x64.nsi b/PackTools/package260701wx x64.nsi index 084d727..6aeaa81 100644 --- a/PackTools/package260701wx x64.nsi +++ b/PackTools/package260701wx x64.nsi @@ -6,7 +6,8 @@ !define PRODUCT_PUBLISHER "29Ӧ" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29Ӧ.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" +;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;ҪԱȨ +!define PRODUCT_UNINST_ROOT_KEY "HKCU" !define BUILD_PATH "D:\Project\TEMU羳̨\KJD Cef138\PackTools" !define BIN_PATH "D:\Project\TEMU羳̨\KJD Cef138\Bin" @@ -35,7 +36,26 @@ SetCompressor lzma ; װҳ !insertmacro MUI_PAGE_INSTFILES ; װҳ -!define MUI_FINISHPAGE_RUN "$INSTDIR\29Ӧ.exe" +;!define MUI_FINISHPAGE_RUN "$INSTDIR\29Ӧ.exe" ;win10ֱ˫¸Ϊʹú +;!define MUI_FINISHPAGE_RUN "exe_file" ;ָҪеĿִļ· $INSTDIR\MyApp.exeļոʱ +;!define MUI_FINISHPAGE_RUN_TEXT "text" ;øѡԵʾı磺ҵӦá +;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;в˫ţ \" ת +;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;Ĭϲѡиøѡ򣨼ĬϲУ +;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;ֱ exeΪԶ NSIS ʱ MUI_FINISHPAGE_RUN ɲʺִжಽ߼ij +;ʾ================================================================================================================ +;!include "MUI2.nsh" + +;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe" +;!define MUI_FINISHPAGE_RUN_TEXT "Ӧó" +;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent" +;;!define MUI_FINISHPAGE_RUN_NOTCHECKED + +;!insertmacro MUI_PAGE_FINISH +;ʾ============================================================================================================ + +!define MUI_FINISHPAGE_RUN +;װ +!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe" !insertmacro MUI_PAGE_FINISH ; װжعҳ @@ -53,7 +73,9 @@ SetCompressor lzma Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "29Ӧ-΢С.exe" InstallDir "$PROGRAMFILES\29Ӧ-΢С" -InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +;InstallDir "D:\29Ӧ-΢С" +;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString" ShowInstDetails show ShowUnInstDetails show BrandingText "29Ӧ-΢С߰װ" @@ -82,7 +104,8 @@ SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29Ӧ.exe" + ;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29Ӧ.exe" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29Ӧ.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29Ӧ.exe" @@ -96,6 +119,20 @@ Function .onInit !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd +;functionҪдsection֮ +Function LaunchExe + ;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe" + ; ExecWait ȴټƼȷɹ + ;ExecWait '"$INSTDIR\YourApp.exe"' // ȴҲҪװʱȴװټаװ + ; ϣװرնȴʹ Exec + ;Exec '"$INSTDIR\29Ӧ.exe"' + Exec "$INSTDIR\29Ӧ.exe" + ; ͨûȨ򣨼ʹװǹԱȨޣ + ;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)' + ;Exec "$INSTDIR\start.bat" +FunctionEnd + + /****************************** * ǰװжز * ******************************/ @@ -131,7 +168,8 @@ Section Uninstall RMDir /r "$INSTDIR" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + ;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" SetAutoClose true SectionEnd diff --git a/TEMUKJD CEFv138.sln b/TEMUKJD CEFv138.sln index 029eea3..703d13c 100644 --- a/TEMUKJD CEFv138.sln +++ b/TEMUKJD CEFv138.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.32802.440 +VisualStudioVersion = 16.0.36128.20 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AllBase", "AllBase\AllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}" EndProject @@ -19,27 +19,28 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.ActiveCfg = Debug|x86 - {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.Build.0 = Debug|x86 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Any CPU.ActiveCfg = Debug|x64 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|Any CPU.Build.0 = Debug|x64 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.ActiveCfg = Debug|x64 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x64.Build.0 = Debug|x64 {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x86.ActiveCfg = Debug|x86 {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Debug|x86.Build.0 = Debug|x86 {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|Any CPU.Build.0 = Release|Any CPU - {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x64.ActiveCfg = Release|x86 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x64.ActiveCfg = Release|x64 + {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x64.Build.0 = Release|x64 {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x86.ActiveCfg = Release|x86 {6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x86.Build.0 = Release|x86 - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x64.ActiveCfg = Debug|Any CPU - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x64.Build.0 = Debug|Any CPU + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|Any CPU.Build.0 = Debug|x64 + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x64.ActiveCfg = Debug|x64 + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x64.Build.0 = Debug|x64 {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x86.ActiveCfg = Debug|x86 {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Debug|x86.Build.0 = Debug|x86 {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|Any CPU.ActiveCfg = Release|Any CPU {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|Any CPU.Build.0 = Release|Any CPU - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x64.ActiveCfg = Release|Any CPU - {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x64.Build.0 = Release|Any CPU + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x64.ActiveCfg = Release|x64 + {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x64.Build.0 = Release|x64 {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x86.ActiveCfg = Release|x86 {38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x86.Build.0 = Release|x86 {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -50,8 +51,8 @@ Global {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x86.Build.0 = Debug|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|Any CPU.Build.0 = Release|Any CPU - {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x64.ActiveCfg = Release|Any CPU - {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x64.Build.0 = Release|Any CPU + {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x64.ActiveCfg = Release|x64 + {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x64.Build.0 = Release|x64 {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x86.ActiveCfg = Release|Any CPU {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/TEMUKJD/ChangeForm.cs b/TEMUKJD/ChangeForm.cs index 4885a4e..aa4c34e 100644 --- a/TEMUKJD/ChangeForm.cs +++ b/TEMUKJD/ChangeForm.cs @@ -1,15 +1,17 @@ -using System; +using AllBase; +using AllBase.Helper; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Diagnostics; using System.Drawing; +using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using AllBase; -using AllBase.Helper; //using TemuKJD.ChatForms; //using TemuKJD.DashBoardForms; using TemuKJD.BaseForms; @@ -62,6 +64,11 @@ namespace TemuKJD pnlChat.Visible = false; //pnlUpload_Click(null, null); } + if (BaseClass.ForbiddenPage.Contains("拍单")) + { + pnlPurchase.Visible = false; + //pnlUpload_Click(null, null); + } } this.pnlChat.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor; this.pnlUploadGoods.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor; @@ -87,21 +94,45 @@ namespace TemuKJD Hide(); } + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + static extern bool SetForegroundWindow(IntPtr hWnd); private void panel3_Click(object sender, EventArgs e) { try { - Process p = new Process(); - p.StartInfo.FileName = "FindLittleRabbitOrder.exe"; - p.StartInfo.Arguments = BaseClass.UserName + " " + BaseClass.PassWord; - p.StartInfo.UseShellExecute = true; - p.StartInfo.Verb = "runas"; - p.Start(); - Process.GetCurrentProcess().Kill(); + if (File.Exists("29WxFindOrder.exe")) + { + Process p = new Process(); + p.StartInfo.FileName = "29WxFindOrder.exe"; + //p.StartInfo.Arguments = "user_name:" + BaseClass.UserName + " " + "user_name:" + BaseClass.PassWord; + p.StartInfo.Arguments = BaseClass.UserName + " " + BaseClass.PassWord; + // 新版cef不能使用管理员权限启动，否则win10下会报错 + //p.StartInfo.UseShellExecute = true; + p.StartInfo.UseShellExecute = false; + // "runas" 权限继承主程序 + //p.StartInfo.Verb = "runas"; + + p.Start(); + + // 强制客服窗口打开时在最上层，win10可能会导致错误 + p.WaitForInputIdle(); + IntPtr hWnd = p.MainWindowHandle; + if (hWnd != IntPtr.Zero) + { + // 尝试将窗口设为最顶层窗口 + SetForegroundWindow(hWnd); + } + + Process.GetCurrentProcess().Kill(); + } + else + { + BaseMsgForm.ShowInfo("未找到拍单程序启动文件"); + } } catch { - BaseMsgForm.ShowInfo("未找到拍单王启动文件"); } } diff --git a/TEMUKJD/ChangeForm.designer.cs b/TEMUKJD/ChangeForm.designer.cs index da6b12f..adda5e1 100644 --- a/TEMUKJD/ChangeForm.designer.cs +++ b/TEMUKJD/ChangeForm.designer.cs @@ -30,7 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChangeForm)); this.panel4 = new DevComponents.DotNetBar.PanelEx(); - this.panel3 = new DevComponents.DotNetBar.PanelEx(); + this.pnlPurchase = new DevComponents.DotNetBar.PanelEx(); this.label1 = new System.Windows.Forms.Label(); this.pnlUploadGoods = new DevComponents.DotNetBar.PanelEx(); this.panel1 = new DevComponents.DotNetBar.PanelEx(); @@ -54,19 +54,18 @@ this.panel4.Visible = false; this.panel4.Click += new System.EventHandler(this.panel4_Click); // - // panel3 + // pnlPurchase // - this.panel3.Cursor = System.Windows.Forms.Cursors.Hand; - this.panel3.DisabledBackColor = System.Drawing.Color.Empty; - this.panel3.Location = new System.Drawing.Point(44, 171); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(104, 37); - this.panel3.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_buyer_blast; - this.panel3.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; - this.panel3.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); - this.panel3.TabIndex = 2; - this.panel3.Visible = false; - this.panel3.Click += new System.EventHandler(this.panel3_Click); + this.pnlPurchase.Cursor = System.Windows.Forms.Cursors.Hand; + this.pnlPurchase.DisabledBackColor = System.Drawing.Color.Empty; + this.pnlPurchase.Location = new System.Drawing.Point(34, 143); + this.pnlPurchase.Name = "pnlPurchase"; + this.pnlPurchase.Size = new System.Drawing.Size(172, 65); + this.pnlPurchase.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_buyer_blast; + this.pnlPurchase.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; + this.pnlPurchase.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); + this.pnlPurchase.TabIndex = 2; + this.pnlPurchase.Click += new System.EventHandler(this.panel3_Click); // // label1 // @@ -109,7 +108,7 @@ // this.pnlExtend.Cursor = System.Windows.Forms.Cursors.Hand; this.pnlExtend.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlExtend.Location = new System.Drawing.Point(171, 171); + this.pnlExtend.Location = new System.Drawing.Point(300, 128); this.pnlExtend.Name = "pnlExtend"; this.pnlExtend.Size = new System.Drawing.Size(104, 37); this.pnlExtend.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_extend; @@ -138,7 +137,7 @@ this.panel2.Controls.Add(this.pnlExtend); this.panel2.Controls.Add(this.label1); this.panel2.Controls.Add(this.pnlChat); - this.panel2.Controls.Add(this.panel3); + this.panel2.Controls.Add(this.pnlPurchase); this.panel2.Controls.Add(this.panel4); this.panel2.Controls.Add(this.pnlUploadGoods); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; @@ -170,7 +169,7 @@ private DevComponents.DotNetBar.PanelEx panel1; private DevComponents.DotNetBar.PanelEx pnlUploadGoods; - private DevComponents.DotNetBar.PanelEx panel3; + private DevComponents.DotNetBar.PanelEx pnlPurchase; private DevComponents.DotNetBar.PanelEx panel4; private DevComponents.DotNetBar.PanelEx pnlChat; private DevComponents.DotNetBar.PanelEx pnlExtend; diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index fe776df..b487916 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -34,7 +34,7 @@ true - AnyCPU + x64 true full false @@ -43,7 +43,7 @@ prompt 4 false - true + false AnyCPU @@ -57,6 +57,26 @@ 29common_icon.ico + + true + ..\bin\ + DEBUG;TRACE + full + AnyCPU + 7.3 + prompt + false + + + ..\bin\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + true + ..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.dll @@ -74,7 +94,8 @@ ..\DllReference\FiddlerCore4.dll - + + False ..\DllReference\NaiBa.CefHelper.138.dll diff --git a/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.cs index 3f22c4d..d6cde18 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminCardCodeForm.cs @@ -17,7 +17,7 @@ using Work; namespace TemuKJD.KJDForms.AdminForms { - public partial class AdminCardCodeForm : Form + public partial class AdminCardCodeForm : BaseForm { public List lstCardCodeInfo = new List(); public AdminCardCodeForm() diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs index c0cd3ed..07d451b 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.Designer.cs @@ -49,16 +49,8 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label8 = new System.Windows.Forms.Label(); this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.pnlSkuOption = new System.Windows.Forms.Panel(); - this.label9 = new System.Windows.Forms.Label(); - this.btnBookImg = new DevComponents.DotNetBar.PanelEx(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); - this.btnSelect = new TemuKJD.UserControls.ButtonEx(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.pnlSkuOption.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // panel2 @@ -83,7 +75,6 @@ this.panel2.Controls.Add(this.pictureBox1); this.panel2.Controls.Add(this.label8); this.panel2.Controls.Add(this.txtNotes); - this.panel2.Controls.Add(this.pnlSkuOption); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; this.panel2.Location = new System.Drawing.Point(1, 33); this.panel2.Name = "panel2"; @@ -137,7 +128,7 @@ this.txtFissionWords.Multiline = true; this.txtFissionWords.Name = "txtFissionWords"; this.txtFissionWords.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtFissionWords.Size = new System.Drawing.Size(337, 93); + this.txtFissionWords.Size = new System.Drawing.Size(337, 211); this.txtFissionWords.TabIndex = 402; this.txtFissionWords.WatermarkText = "一行一个"; // @@ -315,95 +306,6 @@ this.txtNotes.Size = new System.Drawing.Size(337, 47); this.txtNotes.TabIndex = 385; // - // pnlSkuOption - // - this.pnlSkuOption.Controls.Add(this.label9); - this.pnlSkuOption.Controls.Add(this.btnBookImg); - this.pnlSkuOption.Controls.Add(this.pictureBox2); - this.pnlSkuOption.Controls.Add(this.buttonEx1); - this.pnlSkuOption.Controls.Add(this.btnSelect); - this.pnlSkuOption.Location = new System.Drawing.Point(10, 483); - this.pnlSkuOption.Name = "pnlSkuOption"; - this.pnlSkuOption.Size = new System.Drawing.Size(417, 147); - this.pnlSkuOption.TabIndex = 661; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 10); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(68, 17); - this.label9.TabIndex = 404; - this.label9.Text = "SKU替换图"; - // - // btnBookImg - // - this.btnBookImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnBookImg.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnBookImg.DisabledBackColor = System.Drawing.Color.Empty; - this.btnBookImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnBookImg.Location = new System.Drawing.Point(332, 5); - this.btnBookImg.Name = "btnBookImg"; - this.btnBookImg.Size = new System.Drawing.Size(85, 26); - this.btnBookImg.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnBookImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBookImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnBookImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnBookImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnBookImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnBookImg.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnBookImg.Style.GradientAngle = 90; - this.btnBookImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnBookImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBookImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnBookImg.TabIndex = 654; - this.btnBookImg.Text = "生成书籍图片"; - this.btnBookImg.Visible = false; - this.btnBookImg.Click += new System.EventHandler(this.btnBookImg_Click); - // - // pictureBox2 - // - this.pictureBox2.Location = new System.Drawing.Point(154, 5); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(136, 136); - this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox2.TabIndex = 405; - this.pictureBox2.TabStop = false; - this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); - // - // buttonEx1 - // - this.buttonEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.buttonEx1.Cursor = System.Windows.Forms.Cursors.Hand; - this.buttonEx1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonEx1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.buttonEx1.ForeColor = System.Drawing.Color.White; - this.buttonEx1.Location = new System.Drawing.Point(79, 114); - this.buttonEx1.Margin = new System.Windows.Forms.Padding(2); - this.buttonEx1.Name = "buttonEx1"; - this.buttonEx1.Size = new System.Drawing.Size(70, 26); - this.buttonEx1.TabIndex = 406; - this.buttonEx1.Text = "上传图片"; - this.buttonEx1.UseVisualStyleBackColor = false; - this.buttonEx1.Visible = false; - this.buttonEx1.Click += new System.EventHandler(this.buttonEx1_Click); - // - // btnSelect - // - this.btnSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.ForeColor = System.Drawing.Color.White; - this.btnSelect.Location = new System.Drawing.Point(79, 5); - this.btnSelect.Margin = new System.Windows.Forms.Padding(2); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(70, 26); - this.btnSelect.TabIndex = 407; - this.btnSelect.Text = "选择图片"; - this.btnSelect.UseVisualStyleBackColor = false; - this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); - // // PDDDBProdEditForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -419,9 +321,6 @@ this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.pnlSkuOption.ResumeLayout(false); - this.pnlSkuOption.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -444,13 +343,7 @@ private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox txtHeadWords; private System.Windows.Forms.Label label5; - private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Label label9; - private UserControls.ButtonEx buttonEx1; - private UserControls.ButtonEx btnSelect; private DevComponents.DotNetBar.PanelEx btnEditDetail; - private DevComponents.DotNetBar.PanelEx btnBookImg; - public System.Windows.Forms.Panel pnlSkuOption; public System.Windows.Forms.TextBox txtExtCode; public System.Windows.Forms.TextBox txtProductName; public System.Windows.Forms.Label lblSkcId; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs index 9e44b9a..4825d6a 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs @@ -53,16 +53,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (prodTmp != null) dbProd = prodTmp; } - //var prodTmp = GetProductDetail(dbProd.id.ToString()); - //dbProd.sku_img_replace_base64 = prodTmp.sku_img_replace_base64; - //dbProd.sku_img_replace_url = prodTmp.sku_img_replace_url; - if (!string.IsNullOrWhiteSpace(dbProd.sku_img_replace_url)) - this.pictureBox2.ImageLocation = dbProd.sku_img_replace_url; - else if (!string.IsNullOrWhiteSpace(dbProd.sku_img_replace_base64)) - this.pictureBox2.Image = Base64ChangeImgUrl.Base64ToImage(dbProd.sku_img_replace_base64); // Convert.FromBase64String(dbProd.sku_img_replace_base64); - - //if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "微信店采") - //btnEditDetail.Text = "查看商品SKU"; } } @@ -153,100 +143,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - private void buttonEx1_Click(object sender, EventArgs e) - { - string text = ""; - OpenFileDialog openFileDialog = new OpenFileDialog(); - openFileDialog.Multiselect = false; - // 设置过滤条件，只显示文本文件 - openFileDialog.Filter = "图片文件 (*.jpeg;*.jpg;*.png)|*.jpeg;*.jpg;*.png|All files (*.*)|*.*"; - // 显示对话框并获取结果 - if (openFileDialog.ShowDialog() == DialogResult.OK) - { - try - { - string filePath = openFileDialog.FileName; - //using (Image image = Image.FromFile(filePath)) - //{ - // // 现在你可以使用image对象进行各种操作，比如绘制、保存等 - // //Console.WriteLine("Image loaded successfully."); - // this.pictureBox2.Image = image; - //} - Image image = Image.FromFile(filePath); - this.pictureBox2.Image = image; - - string imgBase64 = ""; - using (MemoryStream memoryStream = new MemoryStream()) - { - image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg); - byte[] imageBytes = memoryStream.ToArray(); - imgBase64 = Convert.ToBase64String(imageBytes); - } - string img_md5 = BaseClass.GetMd5(imgBase64); - - var url = BaseClass.BuildPDDObjString("product/add_sku_img_replace"); - var data = UserLogin.GetSignaturex() + - "&product_db_id=" + dbProd.id; - data += "&img_base64=" + imgBase64; - data += "&img_md5=" + img_md5; - 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")) - { - BaseMsgForm.ShowError("商品图片编辑失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); - } - else - { - dbProd.sku_img_replace_base64 = imgBase64; - dbProd.sku_img_replace_id = BaseRegex.GetIntJson(ref html, "sku_img_replace_id"); - } - } - catch (Exception ex) - { - //Console.WriteLine("An error occurred: " + ex.Message); - BaseMsgForm.ShowError("打开自定义图片失败 " + ex.Message); - return; - } - } - } - - private void pictureBox2_Click(object sender, EventArgs e) - { - ShowImgForm imgFrom = new ShowImgForm(pictureBox2.Image); - imgFrom.ShowDialog(); - } - - private void btnSelect_Click(object sender, EventArgs e) - { - PDDDBProdImgListForm imgListForm = new PDDDBProdImgListForm("select"); - imgListForm.ShowDialog(); - if (imgListForm.SelectDbImgId > 0) - { - var url = BaseClass.BuildPDDObjString("product/mdy_prod_sku_img_replace_id"); - var data = UserLogin.GetSignaturex() + - "&product_db_id=" + dbProd.id; - data += "&img_db_id=" + imgListForm.SelectDbImgId; - 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")) - { - BaseMsgForm.ShowError("商品图片编辑失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); - } - else - { - this.pictureBox2.ImageLocation = imgListForm.SelectDbImgUrl; - dbProd.sku_img_replace_id = imgListForm.SelectDbImgId; - dbProd.sku_img_replace_url = imgListForm.SelectDbImgUrl; - } - } - } - private void btnEditDetail_Click(object sender, EventArgs e) { bool canEdit = true; @@ -322,65 +218,5 @@ namespace TemuKJD.PDDForms.ProductSelectForms } editDetailForm.ShowDialog(); } - - private void btnBookImg_Click(object sender, EventArgs e) - { - var prodJson = this.dbProd.product_json; - var prodInfo = JsonHelper.DeserializeJsonToObject(prodJson); - if (prodInfo != null) - { - string publisher = "出版社：" + new List () { "技术出版社", "文化出版社", "美术出版社" }[Randomx.GetId(3)]; - string isbn = "ISBN："; - string bookName = "书名："; - string bookPrice = "定价：" + prodInfo.detail.sku.Max(s => s.multi_price) * 0.01; - string author = "作者：王老师"; - string publishTime = "出版时间：" + DateTime.Now.AddMonths(-3); - string edition = "版次：1"; - string binding = "装帧：平装"; - - foreach (var propInfo in prodInfo.property.goods_properties) - { - if (propInfo.name.Contains("出版社名称")) - publisher = "出版社：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("ISBN")) - isbn = "ISBN：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("书名")) - bookName = "书名：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("定价")) - bookPrice = "定价：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("作者")) - author = "作者：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("出版时间")) - publishTime = "出版时间：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("版次")) - edition = "版次：" + propInfo.values.FirstOrDefault()?.value; - else if (propInfo.name.Contains("装帧")) - binding = "装帧：" + propInfo.values.FirstOrDefault()?.value; - } - - var bookStr = publisher + "\r\n" + "\r\n" + - isbn + "\r\n" + "\r\n" + - bookName + "\r\n" + "\r\n" + - bookPrice + "\r\n" + "\r\n" + - author + "\r\n" + "\r\n" + - publishTime + "\r\n" + "\r\n" + - edition + "\r\n" + "\r\n" + - binding; - - var imageBg = new Bitmap(800, 800); - using (Graphics g = Graphics.FromImage(imageBg)) - { - g.Clear(Color.White); - //Font font = new Font("宋体", 15, FontStyle.Bold); - Font font = new Font("微软雅黑", 15, FontStyle.Regular); - Brush textBrush = Brushes.Black; - g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; - RectangleF rectF = new RectangleF(80, 80, 800 - 80, 800 - 80); - g.DrawString(bookStr, font, textBrush, rectF); - } - ShowImgForm imgFrom = new ShowImgForm(imageBg); - imgFrom.ShowDialog(); - } - } } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 005dd44..066c9b3 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -414,7 +414,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (!string.IsNullOrEmpty(cmbExportToOutServer.Text)) { - //data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); if (cmbExportToOutServer.Text.Trim() == "是") data += "&send_to_out_server=1"; else if (cmbExportToOutServer.Text.Trim() == "否") @@ -422,6 +421,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms else if (cmbExportToOutServer.Text.Trim() == "导出未拉回") data += "&send_to_out_server=2"; } + else + { + data += "&send_to_out_server=0,1,2"; + } if (cmbSourceType.Text.Trim() != "全部") { @@ -627,7 +630,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms PDDDBProdEditForm editForm = new PDDDBProdEditForm(dbProduct); if (BaseClass.MainPath != "29pdd") { - editForm.pnlSkuOption.Visible = false; editForm.txtProductName.ReadOnly = true; editForm.txtExtCode.ReadOnly = true; editForm.lblSkcId.Text = "仓库编码"; @@ -1317,19 +1319,37 @@ namespace TemuKJD.PDDForms.ProductSelectForms void GetProdWxCat(List dbProdLst) { + var taskCount = Math.Min(5, GlobalConfig.ShopLoginList.Count); + List tList = new List(); foreach (var prod in dbProdLst) { - if (cancellationTokenSource.IsCancellationRequested) - break; - - Invoke(new Action(() => + var t = Task.Run(() => { - this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); - this.statusBar.lblTaskStatus.Text = "正在识别微信类目 " + this.statusBar.pgbTaskProgress.Value + "/" + dbProdLst.Count; - })); + if (cancellationTokenSource.IsCancellationRequested) + return; - var row = dgvDbProduct.Rows.Cast().FirstOrDefault(r => r.Cells["col_spu_id"].Value.ParseToString() == prod.spu_id); - GetProdWxCat(prod, row); + Invoke(new Action(() => + { + this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); + this.statusBar.lblTaskStatus.Text = "正在识别微信类目 " + this.statusBar.pgbTaskProgress.Value + "/" + dbProdLst.Count; + })); + + var row = dgvDbProduct.Rows.Cast().FirstOrDefault(r => r.Cells["col_spu_id"].Value.ParseToString() == prod.spu_id); + GetProdWxCat(prod, row); + }); + tList.Add(t); + + while (tList.Count >= taskCount) + { + Thread.Sleep(50); + tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); + } + } + + while (tList.Count > 0) + { + Thread.Sleep(200); + tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); } } @@ -1337,27 +1357,41 @@ namespace TemuKJD.PDDForms.ProductSelectForms { var shop = GlobalConfig.ShopLoginList.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); WXShopTokenInfo token = WXDBProdUploadForm.lstWXShopTokenInfo.FirstOrDefault(t => t.shopId == shop.ShopId); - if (token == null) - token = new WXShopTokenInfo(); - if (token.isExpire || string.IsNullOrEmpty(token.accessToken)) + for (int i = 0; i < 5; i++) { - AuthInfo auth = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); - //if (auth != null && auth.ExpiresTime > DateTime.Now.AddMinutes(5)) + if (token == null) + token = new WXShopTokenInfo(); + if (token.isExpire || string.IsNullOrEmpty(token.accessToken)) { - token = new WxApiBLL().GetShopWxToken(shop); - - if (!string.IsNullOrEmpty(token.accessToken)) + AuthInfo auth = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shop.ShopId); + //if (auth != null && auth.ExpiresTime > DateTime.Now.AddMinutes(5)) { - WXDBProdUploadForm.lstWXShopTokenInfo.RemoveAll(t => t.shopId == shop.ShopId); - WXDBProdUploadForm.lstWXShopTokenInfo.Add(token); - NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_token_list", WXDBProdUploadForm.lstWXShopTokenInfo); + token = new WxApiBLL().GetShopWxToken(shop); + + if (!string.IsNullOrEmpty(token.accessToken)) + { + WXDBProdUploadForm.lstWXShopTokenInfo.RemoveAll(t => t.shopId == shop.ShopId); + WXDBProdUploadForm.lstWXShopTokenInfo.Add(token); + NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_shop_token_list", WXDBProdUploadForm.lstWXShopTokenInfo); + } } } + // 如果店铺token不可用，随机获取一个上传图片的accessToken + if (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken)) + { + // 获取微信accessToken + //token = new WxApiBLL().GetRandomWxToken(); + + shop = GlobalConfig.ShopLoginList.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); + token = WXDBProdUploadForm.lstWXShopTokenInfo.FirstOrDefault(t => t.shopId == shop.ShopId); + continue; + } + else + { + break; + } } - // 如果店铺token不可用，随机获取一个上传图片的accessToken - if (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken)) - // 获取微信accessToken - token = new WxApiBLL().GetRandomWxToken(); + try { JObject obj = new JObject(); @@ -1657,7 +1691,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms { row.Cells["colMainCate"].Value = mainCatName; row.Cells["col_cat_name"].Value = catName; - row.Cells["colCatBound"].Value = GlobalConfig.WxCatBoundList.FirstOrDefault(cb => cb.leaf_id == dbProd.wx_cat_leaf)?.cat_bound; + if (row.Cells.Cast().FirstOrDefault(c => c.OwningColumn.Name == "colCatBound") is DataGridViewCell boundCell) + boundCell.Value = GlobalConfig.WxCatBoundList.FirstOrDefault(cb => cb.leaf_id == dbProd.wx_cat_leaf)?.cat_bound; })); } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs index 7ecfc30..8307ac8 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs @@ -874,12 +874,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (kjdDbProd?.id == 0) { prod.status = "已清除"; - //var empty_url = BaseClass.BuildObjString("product/mdy_user_select_product_status"); - //var empty_data = UserLogin.GetSignaturex() + - // "&select_add_time=" + prod.add_time.ToString("yyyy-MM-dd HH:mm:ss") + - // "&db_id=" + prod.id + - // "&status=已清除"; - //GetHtml.PostUtf8(empty_url, empty_data); } Invoke(new Action(() => diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.Designer.cs index b338359..d219d58 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.Designer.cs @@ -39,6 +39,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGetType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn(); this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn(); @@ -143,6 +144,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, this.colId, + this.colGetType, this.colSpuId, this.colImgUrl, this.colProductSkcPic, @@ -154,6 +156,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ColDelete}); this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvSelectProduct.Location = new System.Drawing.Point(5, 0); + this.dgvSelectProduct.MultiSelectCheckBox = true; this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; @@ -178,6 +181,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colId.ReadOnly = true; this.colId.Width = 45; // + // colGetType + // + this.colGetType.HeaderText = "来源"; + this.colGetType.Name = "colGetType"; + this.colGetType.ReadOnly = true; + this.colGetType.Visible = false; + // // colSpuId // this.colSpuId.HeaderText = "商品ID"; @@ -243,14 +253,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ColDelete.ReadOnly = true; this.ColDelete.Width = 75; // - // PDDDBProdUserSelectCacheForm + // PDDDBProdUploadSelectCacheForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.ClientSize = new System.Drawing.Size(1112, 600); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.Name = "PDDDBProdUserSelectCacheForm"; + this.KeyPreview = true; + this.Name = "PDDDBProdUploadSelectCacheForm"; this.Text = "待上传商品"; this.TitleText = "待上传商品"; this.Load += new System.EventHandler(this.PDDDBProdUserSelectCacheForm_Load); @@ -275,6 +286,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnClearDgv; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colId; + private System.Windows.Forms.DataGridViewTextBoxColumn colGetType; private System.Windows.Forms.DataGridViewLinkColumn colSpuId; private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl; private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.cs index 3f24007..88c602b 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.cs @@ -29,6 +29,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void PDDDBProdUserSelectCacheForm_Load(object sender, EventArgs e) { + if (BaseClass.UserName == "15288888888") + { + dgvSelectProduct.Columns["colGetType"].Visible = true; + } if (BaseClass.MainPath == "29pdd") { dgvSelectProduct.Columns["colBound"].Visible = false; @@ -45,6 +49,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms int rowIndex = this.dgvSelectProduct.Rows.Add( false, prodSelect.id, + prodSelect.product_get_type_text, BaseClass.SaLevel > 0 ? prodSelect.spu_id : prodSelect.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'), prodSelect.main_img, DataGridViewExtension.defaultBitmap, diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.resx b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.resx index a066be7..0bc9aec 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.resx +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadSelectCacheForm.resx @@ -123,6 +123,9 @@ True + + True + True diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs index 2aa05dc..4580dec 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs @@ -565,171 +565,6 @@ namespace TemuKJD.PDDForms.ShopForms return ""; } - /// - /// 第三方获取商品并直接提交到第三方待上传列表 - /// - /// - /// - /// - public string getThirdProduct(string sProdId, string supplierId) - { - var prodId = sProdId.ParseToLong(); - if (prodId <= 0) - { - BaseMsgForm.ShowError("商品Id不存在！"); - return "failed"; - } - var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == supplierId.ParseToString()); - if (string.IsNullOrEmpty(supplierId) || shop == null) - { - BaseMsgForm.ShowError("店铺不存在！"); - return "failed"; - } - - Task.Run(() => - { - try - { - var sourceShop = shop; - var sourceProdId = prodId; - string success_err_msg = ""; - string errorMsg = ""; - var html = GetPddProdCommitId(sourceShop, sourceProdId.ToString()); - if (!html.Contains("\"success\":true") || !html.Contains("\"result\"")) - { - var errMsg = BaseRegex.GetStringJson(ref html, "error_msg"); - if (string.IsNullOrEmpty(errMsg)) - errMsg = html; - OnInfoReceived("商品获取失败！" + errMsg); - return; - } - var commitId = BaseRegex.GetStringJson(ref html, "goods_commit_id"); - if (string.IsNullOrEmpty(commitId)) - { - OnInfoReceived("商品获取失败！商品提交编号获取失败！"); - return; - } - html = GetPddProdDetail(sourceShop, sourceProdId.ToString(), commitId); - - JObject obj = JObject.Parse(html); - var result = JsonHelper.SerializeObject(obj["result"]); - var sizeRst = ""; - PDDProductDetailInfo product = JsonHelper.DeserializeJsonToObject(result); - if (product == null) - { - OnInfoReceived("商品获取失败！商品数据格式获取失败！"); - return; - } - - //拼多多暂时注释尺码 - //if (product.sizeTemplateId > 0) - //{ - // html = SizeSpecQuery(sourceShop, sourceProdId.ToString(), product.sizeTemplateId.ToString()); - // if (!html.Contains("\"success\":true")) - // { - // success_err_msg += " 尺码表获取失败!" + BaseRegex.GetStringJson(ref html, "errorMsg"); - // } - // else - // { - // obj = JObject.Parse(html); - // sizeRst = JsonHelper.SerializeObject(obj["result"]); - // } - //} - - List shopLst = new List(); - PDDShopListForm.Instance.Invoke(new Action(() => - { - PDDThirdProdSelectAddShopForm shopForm = new PDDThirdProdSelectAddShopForm(); - shopForm.ShowDialog(); - shopLst.AddRange(shopForm.lstSelectShop); - })); - if (shopLst.Count == 0) - { - OnInfoReceived("库存上传操作取消或未选择上传店铺！"); - return; - } - - string main_img = ""; - //if (string.IsNullOrEmpty(main_img)) - // main_img = product.image_url; - //if (string.IsNullOrEmpty(main_img)) - // main_img = product.hd_thumb_url; - //if (string.IsNullOrEmpty(main_img)) - // main_img = product.thumb_url; - if (string.IsNullOrEmpty(main_img)) - main_img = (product.galleries?.FirstOrDefault(img => img.type == 1)?.url).ParseToString(); - if (string.IsNullOrEmpty(main_img)) - main_img = (product.galleries?.FirstOrDefault()?.url).ParseToString(); - var url = BaseClass.BuildObjString("product_third/add_product"); - var data = UserLogin.GetSignaturex() + - "&from_shop_id=" + shop.ShopId + - "&spu_id=" + product.goods_id.ParseToString() + - "&skc_id=" + product.goods_id.ParseToString() + - "&cat_id=" + (product.cat_id).ParseToString() + - "&cat_name=" + HttpUtility.UrlEncode((product.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) + - "&ext_code=" + HttpUtility.UrlEncode(product.out_goods_sn, Encoding.UTF8) + - "&product_name=" + HttpUtility.UrlEncode(product.goods_name, Encoding.UTF8) + - "&product_json=" + HttpUtility.UrlEncode(result, Encoding.UTF8) + - "&size_json=" + HttpUtility.UrlEncode(sizeRst, Encoding.UTF8) + - "&main_img=" + HttpUtility.UrlEncode(main_img, Encoding.UTF8); - 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")) - { - errorMsg = "库存商品保存失败!请检查网络连接：" + - BaseRegex.GetStringJson(ref html, "msg").ParseToString().Replace("'", "\\'").Replace("\"", "\\\""); - } - var id = BaseRegex.GetLongJson(ref html, "id"); - if (id == 0) - goto end; - - foreach (var addProdShop in shopLst) - { - url = BaseClass.BuildObjString("product_third/add_user_select_product"); - data = UserLogin.GetSignaturex() + - "&out_product_id=" + id + - "&shop_id=" + addProdShop.ShopId + - "&shop_account=" + addProdShop.ShopAccount + - "&main_user_name=" + addProdShop.UserName + - "&sub_user_name=" + addProdShop.SubUserName + - "&add_product_remaining=" + addProdShop.AddProductRemaining + - "&status=待上传"; - 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")) - { - errorMsg += product?.goods_id + " " + BaseRegex.GetStringJson(ref html, "msg") + "; "; - } - else - { - addProdShop.AddProductRemaining = addProdShop.AddProductRemaining - 1; - } - } - end:; - if (!string.IsNullOrEmpty(errorMsg)) - { - OnInfoReceived(errorMsg); - } - else - { - OnInfoReceived("库存上传保存成功!" + success_err_msg); - } - } - catch (Exception ex) - { - OnInfoReceived("发生错误：" + ex.Message); - } - }); - - return "success"; - } - TemuCat GetCat(TemuDetailProductInfo product) { if (product == null) diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs index c59f7da..7459ba1 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs @@ -564,47 +564,6 @@ namespace TemuKJD.PDDForms.ShopForms sb.Append("CefSharp.BindObjectAsync('shopObj');"); sb.Append("})();"); cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString()); - - // 库存上传按钮 pdd不需要 - if (1 == 2 && currentUrl.StartsWith("https://mms.pinduoduo.com/goods/goods_list")) - { - Task.Run(() => { - string sAddInputJs = @" - document.addEventListener('wheel', function(event) { - // 检查滚动方向 - //if (event.deltaY < 0) { - // console.log('向上滚动'); - //} else { - // console.log('向下滚动'); - //} - // 或者使用 event.deltaX 来检查水平滚动 - //if (event.deltaX < 0) { - // console.log('向左滚动'); - //} else if (event.deltaX > 0) { - // console.log('向右滚动'); - //} - - // 阻止默认的滚动行为（如果有需要） - //event.preventDefault(); - - addGetProdButton(); - }); - addGetProdButton(); - - function addGetProdButton() { - var productLst = document.getElementsByClassName('goods-id'); - for(i=0; i= 0) { - var sSpuId = addBtnItem.innerText.replace('\r','').replace('\n','').replace('ID: ', ''); - addBtnItem.outerHTML = addBtnItem.outerHTML.replace(""
"",""
"") - .replace(""
"", ""
""); - } - } - }"; - cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sAddInputJs); - }); - } } //public Func BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行） diff --git a/TEMUKJD/Resources/choice_buyer_blast.png b/TEMUKJD/Resources/choice_buyer_blast.png index e3b3f4773695298fe9007dd9b92ce8d574453f91..7e58887445f7f8d3a7a72ef6362f727e12efbf03 100644 GIT binary patch delta 1909 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 diff --git a/TEMUKJD/Resources/choice_buyer_blast_old.png b/TEMUKJD/Resources/choice_buyer_blast_old.png new file mode 100644 index 0000000000000000000000000000000000000000..e3b3f4773695298fe9007dd9b92ce8d574453f91 GIT binary patch literal 6505 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 literal 0 HcmV?d00001 diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs index 0bac48e..ac727c9 100644 --- a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs @@ -393,7 +393,6 @@ namespace TemuKJD.ToolForms PDDDBProdEditForm editForm = new PDDDBProdEditForm(dbProduct); if (BaseClass.MainPath != "29pdd") { - editForm.pnlSkuOption.Visible = false; editForm.txtProductName.ReadOnly = true; editForm.txtExtCode.ReadOnly = true; editForm.lblSkcId.Text = "仓库编码"; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index 0a79ae6..9a0a6c8 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -81,6 +81,7 @@ namespace TemuKJD.WXForms.AdminForms this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.pnlShopPointsPerMonth = new System.Windows.Forms.Panel(); + this.lblShopPointsPerMonthUserId = new System.Windows.Forms.Label(); this.lblShopPointsPerMonthUserInfo = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); this.numShopPointsPerMonth = new System.Windows.Forms.NumericUpDown(); @@ -114,7 +115,7 @@ namespace TemuKJD.WXForms.AdminForms this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); - this.lblShopPointsPerMonthUserId = new System.Windows.Forms.Label(); + this.chkTraineeData = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -143,6 +144,7 @@ namespace TemuKJD.WXForms.AdminForms // splitContainer5.Panel1 // this.splitContainer5.Panel1.BackColor = System.Drawing.Color.WhiteSmoke; + this.splitContainer5.Panel1.Controls.Add(this.chkTraineeData); this.splitContainer5.Panel1.Controls.Add(this.line2); this.splitContainer5.Panel1.Controls.Add(this.btnFilter); this.splitContainer5.Panel1.Controls.Add(this.txtAuth); @@ -699,6 +701,16 @@ namespace TemuKJD.WXForms.AdminForms this.pnlShopPointsPerMonth.TabIndex = 9; this.pnlShopPointsPerMonth.Visible = false; // + // lblShopPointsPerMonthUserId + // + this.lblShopPointsPerMonthUserId.AutoSize = true; + this.lblShopPointsPerMonthUserId.Location = new System.Drawing.Point(256, 19); + this.lblShopPointsPerMonthUserId.Name = "lblShopPointsPerMonthUserId"; + this.lblShopPointsPerMonthUserId.Size = new System.Drawing.Size(47, 17); + this.lblShopPointsPerMonthUserId.TabIndex = 456; + this.lblShopPointsPerMonthUserId.Text = "UserId"; + this.lblShopPointsPerMonthUserId.Visible = false; + // // lblShopPointsPerMonthUserInfo // this.lblShopPointsPerMonthUserInfo.AutoSize = true; @@ -1107,15 +1119,14 @@ namespace TemuKJD.WXForms.AdminForms this.btnExportShopErp.Visible = false; this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); // - // lblUserId + // chkTraineeData // - this.lblShopPointsPerMonthUserId.AutoSize = true; - this.lblShopPointsPerMonthUserId.Location = new System.Drawing.Point(256, 19); - this.lblShopPointsPerMonthUserId.Name = "lblUserId"; - this.lblShopPointsPerMonthUserId.Size = new System.Drawing.Size(47, 17); - this.lblShopPointsPerMonthUserId.TabIndex = 456; - this.lblShopPointsPerMonthUserId.Text = "UserId"; - this.lblShopPointsPerMonthUserId.Visible = false; + this.chkTraineeData.Location = new System.Drawing.Point(192, 453); + this.chkTraineeData.Name = "chkTraineeData"; + this.chkTraineeData.Size = new System.Drawing.Size(68, 21); + this.chkTraineeData.TabIndex = 829; + this.chkTraineeData.Text = "学员数据"; + this.chkTraineeData.UseVisualStyleBackColor = true; // // WXAdminAccountForm // @@ -1236,5 +1247,6 @@ namespace TemuKJD.WXForms.AdminForms private DevComponents.DotNetBar.PanelEx btnShopPointsPerMonthCancel; private DevComponents.DotNetBar.PanelEx btnShopPointsPerMonth; private System.Windows.Forms.Label lblShopPointsPerMonthUserId; + private UserComponent.UcCheckBox chkTraineeData; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index 72ea51f..82e650f 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -96,6 +96,8 @@ namespace TemuKJD.WXForms.AdminForms authority += chkShopPoints.Text + ","; // 充值用户 if (chkProdFission.Checked) authority += chkProdFission.Text + ","; // 裂变调试 + if (chkTraineeData.Checked) + authority += chkTraineeData.Text + ","; // 学员数据 data.Append("&authority=" + authority.Trim(',')); string url = BaseClass.BuildObjString("user/add_user"); @@ -210,6 +212,7 @@ namespace TemuKJD.WXForms.AdminForms chkWXComplateProd.Checked = false; chkWXShowProdGetFromType.Checked = false; chkChanceProdCollect.Checked = false; + chkTraineeData.Checked = false; chkShopOptimize.Checked = false; chkEcWaybill.Checked = false; chkCommissionUpdate.Checked = false; @@ -253,6 +256,7 @@ namespace TemuKJD.WXForms.AdminForms chkShopPoints.Checked = authority.Contains(chkShopPoints.Text); chkProdFission.Checked = authority.Contains(chkProdFission.Text); chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text); + chkTraineeData.Checked = authority.Contains(chkTraineeData.Text); chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text); chkEcWaybill.Checked = authority.Contains(chkEcWaybill.Text); chkCommissionUpdate.Checked = authority.Contains(chkCommissionUpdate.Text); diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 2aee728..96698ee 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -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(() => diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs index 2acaad9..2caa9fe 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs @@ -71,22 +71,20 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearDgv = new DevComponents.DotNetBar.PanelEx(); this.btnSetPreSale = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.label9 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); this.chkSearchPromotionLink = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbOnSaleStatus = new System.Windows.Forms.ComboBox(); + this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); + this.chkProdTime = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); this.cmbPreType = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); - this.txtIdFilter = new System.Windows.Forms.TextBox(); - this.lblIdFilter = new System.Windows.Forms.Label(); this.btnStopSearch = new DevComponents.DotNetBar.PanelEx(); this.txtPageEnd = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); - this.txtProductName = new System.Windows.Forms.TextBox(); - this.label11 = new System.Windows.Forms.Label(); this.btnClearFilter = new DevComponents.DotNetBar.PanelEx(); - this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); - this.lblExtCodeFilter = new System.Windows.Forms.Label(); this.btnSearchProd = new DevComponents.DotNetBar.PanelEx(); - this.label5 = new System.Windows.Forms.Label(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label24 = new System.Windows.Forms.Label(); @@ -107,6 +105,12 @@ namespace TemuKJD.WXForms.ProductForms this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.txtPageBegin = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); + this.txtIdFilter = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); + this.lblIdFilter = new System.Windows.Forms.Label(); + this.txtProductName = new System.Windows.Forms.TextBox(); + this.lblExtCodeFilter = new System.Windows.Forms.Label(); + this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -125,8 +129,6 @@ namespace TemuKJD.WXForms.ProductForms this.pbLoading = new System.Windows.Forms.PictureBox(); this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -154,6 +156,8 @@ namespace TemuKJD.WXForms.ProductForms this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn(); this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -708,22 +712,18 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.Controls.Add(this.label5); this.ucGroupBoxEx4.Controls.Add(this.chkSearchPromotionLink); this.ucGroupBoxEx4.Controls.Add(this.cmbOnSaleStatus); + this.ucGroupBoxEx4.Controls.Add(this.dtpStartTime); this.ucGroupBoxEx4.Controls.Add(this.cmbPreType); this.ucGroupBoxEx4.Controls.Add(this.label3); - this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); - this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); this.ucGroupBoxEx4.Controls.Add(this.btnStopSearch); this.ucGroupBoxEx4.Controls.Add(this.txtPageEnd); this.ucGroupBoxEx4.Controls.Add(this.label2); - this.ucGroupBoxEx4.Controls.Add(this.txtProductName); - this.ucGroupBoxEx4.Controls.Add(this.label11); this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter); - this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter); - this.ucGroupBoxEx4.Controls.Add(this.lblExtCodeFilter); this.ucGroupBoxEx4.Controls.Add(this.btnSearchProd); - this.ucGroupBoxEx4.Controls.Add(this.label5); + this.ucGroupBoxEx4.Controls.Add(this.chkProdTime); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165); @@ -731,10 +731,32 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "商品查询"; // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(17, 144); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(32, 17); + this.label9.TabIndex = 988; + this.label9.Text = "结束"; + this.label9.Visible = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(14, 61); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.label5.Size = new System.Drawing.Size(56, 17); + this.label5.TabIndex = 818; + this.label5.Text = "商品状态"; + // // chkSearchPromotionLink // this.chkSearchPromotionLink.AutoSize = true; - this.chkSearchPromotionLink.Location = new System.Drawing.Point(231, 61); + this.chkSearchPromotionLink.Location = new System.Drawing.Point(17, 91); this.chkSearchPromotionLink.Name = "chkSearchPromotionLink"; this.chkSearchPromotionLink.Size = new System.Drawing.Size(147, 21); this.chkSearchPromotionLink.TabIndex = 827; @@ -752,7 +774,7 @@ namespace TemuKJD.WXForms.ProductForms "审核待处理", "草稿箱", "回收站"}); - this.cmbOnSaleStatus.Location = new System.Drawing.Point(68, 59); + this.cmbOnSaleStatus.Location = new System.Drawing.Point(71, 57); this.cmbOnSaleStatus.Name = "cmbOnSaleStatus"; this.cmbOnSaleStatus.Size = new System.Drawing.Size(134, 25); this.cmbOnSaleStatus.TabIndex = 817; @@ -760,6 +782,38 @@ namespace TemuKJD.WXForms.ProductForms this.cmbOnSaleStatus.SelectedIndexChanged += new System.EventHandler(this.cmbOnSaleStatus_SelectedIndexChanged); this.cmbOnSaleStatus.TextChanged += new System.EventHandler(this.cmbOnSaleStatus_TextChanged); // + // dtpEndTime + // + this.dtpEndTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dtpEndTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpEndTime.Location = new System.Drawing.Point(49, 141); + this.dtpEndTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.dtpEndTime.Name = "dtpEndTime"; + this.dtpEndTime.Size = new System.Drawing.Size(134, 23); + this.dtpEndTime.TabIndex = 986; + this.dtpEndTime.Visible = false; + // + // chkProdTime + // + this.chkProdTime.AutoSize = true; + this.chkProdTime.Location = new System.Drawing.Point(211, 59); + this.chkProdTime.Name = "chkProdTime"; + this.chkProdTime.Size = new System.Drawing.Size(60, 21); + this.chkProdTime.TabIndex = 837; + this.chkProdTime.Text = "时间>"; + this.chkProdTime.UseVisualStyleBackColor = true; + this.chkProdTime.CheckedChanged += new System.EventHandler(this.chkProdTime_CheckedChanged); + // + // dtpStartTime + // + this.dtpStartTime.CustomFormat = "yyyy-MM-dd HH:mm"; + this.dtpStartTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.dtpStartTime.Location = new System.Drawing.Point(262, 58); + this.dtpStartTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.dtpStartTime.Name = "dtpStartTime"; + this.dtpStartTime.Size = new System.Drawing.Size(134, 23); + this.dtpStartTime.TabIndex = 985; + // // cmbPreType // this.cmbPreType.FormattingEnabled = true; @@ -767,7 +821,7 @@ namespace TemuKJD.WXForms.ProductForms "", "预售", "非预售"}); - this.cmbPreType.Location = new System.Drawing.Point(262, 25); + this.cmbPreType.Location = new System.Drawing.Point(263, 25); this.cmbPreType.Name = "cmbPreType"; this.cmbPreType.Size = new System.Drawing.Size(134, 25); this.cmbPreType.TabIndex = 807; @@ -784,27 +838,6 @@ namespace TemuKJD.WXForms.ProductForms this.label3.TabIndex = 806; this.label3.Text = "预售状态"; // - // txtIdFilter - // - this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtIdFilter.Location = new System.Drawing.Point(262, 93); - this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtIdFilter.Name = "txtIdFilter"; - this.txtIdFilter.Size = new System.Drawing.Size(134, 25); - this.txtIdFilter.TabIndex = 652; - this.txtIdFilter.Visible = false; - // - // lblIdFilter - // - this.lblIdFilter.AutoSize = true; - this.lblIdFilter.Location = new System.Drawing.Point(242, 97); - this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblIdFilter.Name = "lblIdFilter"; - this.lblIdFilter.Size = new System.Drawing.Size(21, 17); - this.lblIdFilter.TabIndex = 651; - this.lblIdFilter.Text = "ID"; - this.lblIdFilter.Visible = false; - // // btnStopSearch // this.btnStopSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -834,7 +867,7 @@ namespace TemuKJD.WXForms.ProductForms // txtPageEnd // this.txtPageEnd.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtPageEnd.Location = new System.Drawing.Point(68, 25); + this.txtPageEnd.Location = new System.Drawing.Point(70, 25); this.txtPageEnd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtPageEnd.Name = "txtPageEnd"; this.txtPageEnd.Size = new System.Drawing.Size(134, 25); @@ -845,7 +878,7 @@ namespace TemuKJD.WXForms.ProductForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(13, 29); + this.label2.Location = new System.Drawing.Point(14, 30); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; this.label2.RightToLeft = System.Windows.Forms.RightToLeft.Yes; @@ -853,27 +886,6 @@ namespace TemuKJD.WXForms.ProductForms this.label2.TabIndex = 793; this.label2.Text = "查询页数"; // - // txtProductName - // - this.txtProductName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtProductName.Location = new System.Drawing.Point(68, 93); - this.txtProductName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtProductName.Name = "txtProductName"; - this.txtProductName.Size = new System.Drawing.Size(134, 25); - this.txtProductName.TabIndex = 784; - this.txtProductName.Visible = false; - // - // label11 - // - this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(37, 99); - this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(32, 17); - this.label11.TabIndex = 785; - this.label11.Text = "标题"; - this.label11.Visible = false; - // // btnClearFilter // this.btnClearFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -900,27 +912,6 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter.Text = "清空条件"; this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click); // - // txtExtCodeFilter - // - this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtExtCodeFilter.Location = new System.Drawing.Point(68, 127); - this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtExtCodeFilter.Name = "txtExtCodeFilter"; - this.txtExtCodeFilter.Size = new System.Drawing.Size(134, 25); - this.txtExtCodeFilter.TabIndex = 555; - this.txtExtCodeFilter.Visible = false; - // - // lblExtCodeFilter - // - this.lblExtCodeFilter.AutoSize = true; - this.lblExtCodeFilter.Location = new System.Drawing.Point(37, 131); - this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblExtCodeFilter.Name = "lblExtCodeFilter"; - this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17); - this.lblExtCodeFilter.TabIndex = 560; - this.lblExtCodeFilter.Text = "货号"; - this.lblExtCodeFilter.Visible = false; - // // btnSearchProd // this.btnSearchProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -945,17 +936,6 @@ namespace TemuKJD.WXForms.ProductForms this.btnSearchProd.Text = "商品查询"; this.btnSearchProd.Click += new System.EventHandler(this.btnSearchProd_Click); // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 63); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label5.Name = "label5"; - this.label5.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.label5.Size = new System.Drawing.Size(56, 17); - this.label5.TabIndex = 818; - this.label5.Text = "商品状态"; - // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -1269,9 +1249,17 @@ namespace TemuKJD.WXForms.ProductForms // // splitContainer2.Panel1 // + this.splitContainer2.Panel1.Controls.Add(this.label9); this.splitContainer2.Panel1.Controls.Add(this.pbLoadingShop); this.splitContainer2.Panel1.Controls.Add(this.txtPageBegin); this.splitContainer2.Panel1.Controls.Add(this.label1); + this.splitContainer2.Panel1.Controls.Add(this.dtpEndTime); + this.splitContainer2.Panel1.Controls.Add(this.txtIdFilter); + this.splitContainer2.Panel1.Controls.Add(this.label11); + this.splitContainer2.Panel1.Controls.Add(this.lblIdFilter); + this.splitContainer2.Panel1.Controls.Add(this.txtProductName); + this.splitContainer2.Panel1.Controls.Add(this.lblExtCodeFilter); + this.splitContainer2.Panel1.Controls.Add(this.txtExtCodeFilter); this.splitContainer2.Panel1.Controls.Add(this.dgvShop); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); // @@ -1321,6 +1309,69 @@ namespace TemuKJD.WXForms.ProductForms this.label1.Text = "开始页"; this.label1.Visible = false; // + // txtIdFilter + // + this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtIdFilter.Location = new System.Drawing.Point(138, 71); + this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtIdFilter.Name = "txtIdFilter"; + this.txtIdFilter.Size = new System.Drawing.Size(44, 25); + this.txtIdFilter.TabIndex = 652; + this.txtIdFilter.Visible = false; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(17, 77); + this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(32, 17); + this.label11.TabIndex = 785; + this.label11.Text = "标题"; + this.label11.Visible = false; + // + // lblIdFilter + // + this.lblIdFilter.AutoSize = true; + this.lblIdFilter.Location = new System.Drawing.Point(117, 75); + this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblIdFilter.Name = "lblIdFilter"; + this.lblIdFilter.Size = new System.Drawing.Size(21, 17); + this.lblIdFilter.TabIndex = 651; + this.lblIdFilter.Text = "ID"; + this.lblIdFilter.Visible = false; + // + // txtProductName + // + this.txtProductName.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtProductName.Location = new System.Drawing.Point(48, 71); + this.txtProductName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtProductName.Name = "txtProductName"; + this.txtProductName.Size = new System.Drawing.Size(43, 25); + this.txtProductName.TabIndex = 784; + this.txtProductName.Visible = false; + // + // lblExtCodeFilter + // + this.lblExtCodeFilter.AutoSize = true; + this.lblExtCodeFilter.Location = new System.Drawing.Point(17, 111); + this.lblExtCodeFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblExtCodeFilter.Name = "lblExtCodeFilter"; + this.lblExtCodeFilter.Size = new System.Drawing.Size(32, 17); + this.lblExtCodeFilter.TabIndex = 560; + this.lblExtCodeFilter.Text = "货号"; + this.lblExtCodeFilter.Visible = false; + // + // txtExtCodeFilter + // + this.txtExtCodeFilter.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtExtCodeFilter.Location = new System.Drawing.Point(48, 107); + this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtExtCodeFilter.Name = "txtExtCodeFilter"; + this.txtExtCodeFilter.Size = new System.Drawing.Size(134, 25); + this.txtExtCodeFilter.TabIndex = 555; + this.txtExtCodeFilter.Visible = false; + // // dgvShop // this.dgvShop.AllowUserToAddRows = false; @@ -1558,31 +1609,6 @@ namespace TemuKJD.WXForms.ProductForms this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.statusBar); - this.splitContainer4.Size = new System.Drawing.Size(1346, 26); - this.splitContainer4.SplitterDistance = 1165; - this.splitContainer4.TabIndex = 3; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1165, 26); - this.statusBar.TabIndex = 2; - // // colCheck // this.colCheck.Frozen = true; @@ -1806,6 +1832,31 @@ namespace TemuKJD.WXForms.ProductForms this.colOpResult.ReadOnly = true; this.colOpResult.Width = 240; // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + this.splitContainer4.Size = new System.Drawing.Size(1346, 26); + this.splitContainer4.SplitterDistance = 1165; + this.splitContainer4.TabIndex = 3; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1165, 26); + this.statusBar.TabIndex = 2; + // // WXProdPreSaleForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1965,5 +2016,9 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; + private UserComponent.UcCheckBox chkProdTime; + private System.Windows.Forms.DateTimePicker dtpStartTime; + private System.Windows.Forms.DateTimePicker dtpEndTime; + private System.Windows.Forms.Label label9; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs index c901d7c..5c24654 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.cs @@ -122,41 +122,7 @@ namespace TemuKJD.WXForms.ProductForms dgvSelectProduct.Columns["colSkuFakeImg"].Visible = false; - //foreach (var selectProd in upload_draft_product_lst) - //{ - // int rowIndex = 0; - // this.dgvSelectProduct.Rows.Insert(rowIndex, - // true, - // selectProd.id, - // selectProd.shop_id, - // selectProd.shop_account, - // "登录", - // "进店", - // BaseClass.SaLevel > 0 ? selectProd.spu_id : selectProd.spu_id.ParseToString().GetHashCode().ParseToString().Trim('-'), - // selectProd.skc_id, - // selectProd.main_img, - // DataGridViewExtension.defaultBitmap, - // "", - // null, - // selectProd.product_name, // 用户端显示商品原名 - // selectProd.cat_name, - // BaseClass.SaLevel > 0 ? selectProd.ext_code : selectProd.ext_code.ParseToString().GetHashCode().ParseToString().Trim('-'), - // selectProd.status, - // selectProd.draft_id, - // selectProd.notes, - // (selectProd.user_notes + " 编辑").Trim(), - // "删除", - // selectProd.add_time.ToString("yy-MM-dd HH:mm:ss"), - // ""); - - // dgvSelectProduct.Rows[rowIndex].Height = 60; - - // int maxRowCount = 10000; - // while (dgvSelectProduct.Rows.Count > maxRowCount) - // { - // dgvSelectProduct.Rows.RemoveAt(maxRowCount); - // } - //} + dtpStartTime.Value = DateTime.Now.Date.AddMonths(-1); //#if DEBUG if (BaseClass.SaLevel == 1) @@ -779,11 +745,19 @@ namespace TemuKJD.WXForms.ProductForms //this.statusBar.pgbTaskProgress.Maximum = lstTemuDBProductSelect.Count; //this.statusBar.UpdateProgressBar(0); })); + bool istTimeOver = false; + List tList = new List(); foreach (JObject prod in prodObjs["productList"]) { string StatusStr = ""; int rowIndex = 0; var pStr = JsonHelper.SerializeObject(prod); + var editTime = BaseClass.StampToDateTime(prod["editTime"].ParseToInt()); + if (chkProdTime.Checked && editTime < dtpStartTime.Value) + { + istTimeOver = true; + break; + } Invoke(new Action(() => { decimal? minPrice = prod["skuList"]?.Min(sk => sk["price"].ParseToDecimal() / 100); @@ -791,7 +765,6 @@ namespace TemuKJD.WXForms.ProductForms var prodId = prod["productId"].ParseToString(); if (dgvSelectProduct.Rows.Cast().Any(r => r.Cells["colDraftId"].ParseToString() == prodId)) { - } StatusStr = "其他"; if (prod["status"].ParseToInt() == 5) @@ -839,8 +812,8 @@ namespace TemuKJD.WXForms.ProductForms "", // 备注 "", "删除", - BaseClass.StampToDateTime(prod["lastEditDraftTime"].ParseToInt()).ToString("yy-MM-dd HH:mm"), - ""); + editTime.ToString("yy-MM-dd HH:mm"), + ""); dgvSelectProduct.Rows[rowIndex].Height = 60; Color color = Color.Red; @@ -856,37 +829,56 @@ namespace TemuKJD.WXForms.ProductForms dgvSelectProduct.Rows[rowIndex].Cells["colPreSale"].Style.ForeColor = dgvSelectProduct.Rows[rowIndex].Cells["colPreSale"].Value.ParseToString().Contains("预售") ? Color.Green : Color.Blue; })); + // 获取商品链接 if (StatusStr.ParseToString().StartsWith("在售") && chkSearchPromotionLink.Checked == true) { - Task.Run(() => { }); - var PromotionRst = WXPreSale.GetPromotionLink(shop, prod["productId"].ParseToString(), page); - Thread.Sleep(Randomx.GetId(50, 150)); - if (PromotionRst.ParseToString().Contains("\"code\":0")) + var t = Task.Run(() => { - var shareUrl = BaseRegex.GetStringJson(ref PromotionRst, "shareUrl"); - var shortLink = BaseRegex.GetStringJson(ref PromotionRst, "shortLink"); - if (!string.IsNullOrEmpty(shareUrl)) + var PromotionRst = WXPreSale.GetPromotionLink(shop, prod["productId"].ParseToString(), page); + Thread.Sleep(Randomx.GetId(50, 150)); + if (PromotionRst.ParseToString().Contains("\"code\":0")) { - Invoke(new Action(() => { - dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl; - })); + var shareUrl = BaseRegex.GetStringJson(ref PromotionRst, "shareUrl"); + var shortLink = BaseRegex.GetStringJson(ref PromotionRst, "shortLink"); + if (!string.IsNullOrEmpty(shareUrl)) + { + Invoke(new Action(() => + { + dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = shareUrl; + })); + } + else + { + Invoke(new Action(() => + { + dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = "链接获取失败"; + })); + } } else { - Invoke(new Action(() => { - dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = "链接获取失败"; + var errMsg = BaseRegex.GetStringJsonByRegs(ref PromotionRst, PromotionRst, "errMsg", "errorMsg", "err_msg", "error_msg", "errormsg"); + Invoke(new Action(() => + { + dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = errMsg; })); } - } - else + }); + tList.Add(t); + while (tList.Count >= 5) { - var errMsg = BaseRegex.GetStringJsonByRegs(ref PromotionRst, PromotionRst, "errMsg", "errorMsg", "err_msg", "error_msg", "errormsg"); - Invoke(new Action(() => { - dgvSelectProduct.Rows[rowIndex].Cells["colPromotionLink"].Value = errMsg; - })); + Thread.Sleep(200); + tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); } } } + while (tList.Count > 0) + { + Thread.Sleep(200); + tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); + } + if (istTimeOver) + break; } catch (Exception ex) { @@ -1799,7 +1791,7 @@ namespace TemuKJD.WXForms.ProductForms } }); tList.Add(t); - while(tList.Count > 20) + while(tList.Count >= 20) { Thread.Sleep(200); tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); @@ -2019,7 +2011,7 @@ namespace TemuKJD.WXForms.ProductForms } }); tList.Add(t); - while (tList.Count > 20) + while (tList.Count >= 20) { Thread.Sleep(200); tList.RemoveAll(ta => ta.IsFaulted || ta.IsCanceled || ta.IsCompleted); @@ -2032,6 +2024,11 @@ namespace TemuKJD.WXForms.ProductForms } } } + + private void chkProdTime_CheckedChanged(object sender, EventArgs e) + { + + } } public class WXPreSale diff --git a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs index e16e21c..7f901e3 100644 --- a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs @@ -560,7 +560,6 @@ namespace TemuKJD.WXForms.ProductForms } if (!string.IsNullOrEmpty(cmbExportToOutServer.Text) && cmbGroupFilter.Text != "我的商品") // 用户自己的商品没有聚水潭商品，不用考虑是否导出 { - ////data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); //if (cmbExportToOutServer.Text.Trim() == "是") // data += "&send_to_out_server=1"; //else if (cmbExportToOutServer.Text.Trim() == "否") diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index a9823bb..0710662 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -441,7 +441,6 @@ namespace TemuKJD.WXForms.ProductForms } if (!string.IsNullOrEmpty(cmbExportToOutServer.Text)) { - //data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); if (cmbExportToOutServer.Text.Trim() == "是") data += "&send_to_out_server=1"; else if (cmbExportToOutServer.Text.Trim() == "否") diff --git a/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs index 5f1f1bb..6d60237 100644 --- a/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXPDDShopLoginForm.cs @@ -524,47 +524,6 @@ namespace TemuKJD.WXForms.ShopForms sb.Append("CefSharp.BindObjectAsync('shopObj');"); sb.Append("})();"); cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString()); - - // 库存上传按钮 pdd不需要 - if (1 == 2 && currentUrl.StartsWith("https://mms.pinduoduo.com/goods/goods_list")) - { - Task.Run(() => { - string sAddInputJs = @" - document.addEventListener('wheel', function(event) { - // 检查滚动方向 - //if (event.deltaY < 0) { - // console.log('向上滚动'); - //} else { - // console.log('向下滚动'); - //} - // 或者使用 event.deltaX 来检查水平滚动 - //if (event.deltaX < 0) { - // console.log('向左滚动'); - //} else if (event.deltaX > 0) { - // console.log('向右滚动'); - //} - - // 阻止默认的滚动行为（如果有需要） - //event.preventDefault(); - - addGetProdButton(); - }); - addGetProdButton(); - - function addGetProdButton() { - var productLst = document.getElementsByClassName('goods-id'); - for(i=0; i= 0) { - var sSpuId = addBtnItem.innerText.replace('\r','').replace('\n','').replace('ID: ', ''); - addBtnItem.outerHTML = addBtnItem.outerHTML.replace(""
"",""
"") - .replace(""
"", ""
""); - } - } - }"; - cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sAddInputJs); - }); - } } //public Func BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行） diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs index fa0de8e..97826a1 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.Designer.cs @@ -70,6 +70,8 @@ this.pbLoading = new System.Windows.Forms.PictureBox(); this.btnImport = new TemuKJD.UserControls.ButtonEx(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.chkAutoDrag = new System.Windows.Forms.CheckBox(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -99,8 +101,6 @@ this.colCopyCookies = new System.Windows.Forms.DataGridViewLinkColumn(); this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -358,7 +358,7 @@ this.cmbGroup.DropDownWidth = 1; this.cmbGroup.FormattingEnabled = true; this.cmbGroup.IntegralHeight = false; - this.cmbGroup.Location = new System.Drawing.Point(385, 8); + this.cmbGroup.Location = new System.Drawing.Point(385, 5); this.cmbGroup.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(74, 25); @@ -384,7 +384,7 @@ this.cmbNotes.DropDownWidth = 1; this.cmbNotes.FormattingEnabled = true; this.cmbNotes.IntegralHeight = false; - this.cmbNotes.Location = new System.Drawing.Point(276, 8); + this.cmbNotes.Location = new System.Drawing.Point(276, 5); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(74, 25); @@ -517,7 +517,7 @@ this.cmbSubAccount.DropDownWidth = 1; this.cmbSubAccount.FormattingEnabled = true; this.cmbSubAccount.IntegralHeight = false; - this.cmbSubAccount.Location = new System.Drawing.Point(506, 8); + this.cmbSubAccount.Location = new System.Drawing.Point(506, 5); this.cmbSubAccount.Margin = new System.Windows.Forms.Padding(0, 0, 0, 4); this.cmbSubAccount.Name = "cmbSubAccount"; this.cmbSubAccount.Size = new System.Drawing.Size(74, 25); @@ -826,6 +826,31 @@ this.dgvShop.TabIndex = 5; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // + // chkAutoDrag + // + this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkAutoDrag.AutoSize = true; + this.chkAutoDrag.BackColor = System.Drawing.Color.White; + this.chkAutoDrag.Location = new System.Drawing.Point(1238, 2); + this.chkAutoDrag.Name = "chkAutoDrag"; + this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); + this.chkAutoDrag.TabIndex = 3; + this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; + this.chkAutoDrag.UseVisualStyleBackColor = false; + this.chkAutoDrag.Visible = false; + this.chkAutoDrag.Click += new System.EventHandler(this.chkAutoDrag_Click); + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Bottom; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, -1); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1394, 29); + this.statusBar.TabIndex = 1; + // // colSelect // this.colSelect.FillWeight = 26F; @@ -999,7 +1024,6 @@ this.colBuyApi.ReadOnly = true; this.colBuyApi.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colBuyApi.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.colBuyApi.Visible = false; // // colMultiLogin // @@ -1065,31 +1089,6 @@ this.colDelete.Name = "colDelete"; this.colDelete.ReadOnly = true; // - // chkAutoDrag - // - this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkAutoDrag.AutoSize = true; - this.chkAutoDrag.BackColor = System.Drawing.Color.White; - this.chkAutoDrag.Location = new System.Drawing.Point(1238, 2); - this.chkAutoDrag.Name = "chkAutoDrag"; - this.chkAutoDrag.Size = new System.Drawing.Size(159, 21); - this.chkAutoDrag.TabIndex = 3; - this.chkAutoDrag.Text = "登录时自动滑动拼图验证"; - this.chkAutoDrag.UseVisualStyleBackColor = false; - this.chkAutoDrag.Visible = false; - this.chkAutoDrag.Click += new System.EventHandler(this.chkAutoDrag_Click); - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Bottom; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, -1); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1394, 29); - this.statusBar.TabIndex = 1; - // // WXShopListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1172,6 +1171,8 @@ private DevComponents.DotNetBar.PanelEx btnTopUpOK; private System.Windows.Forms.Label lblShopId; private System.Windows.Forms.Label txtPrice; + private DevComponents.DotNetBar.PanelEx btnBatchRenewal; + private DevComponents.DotNetBar.PanelEx btnOpenOrderPage; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginName; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; @@ -1201,7 +1202,5 @@ private System.Windows.Forms.DataGridViewLinkColumn colCopyCookies; private System.Windows.Forms.DataGridViewLinkColumn colEdit; private System.Windows.Forms.DataGridViewLinkColumn colDelete; - private DevComponents.DotNetBar.PanelEx btnBatchRenewal; - private DevComponents.DotNetBar.PanelEx btnOpenOrderPage; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs index 15e0cb0..a7b245c 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopListForm.cs @@ -842,7 +842,8 @@ namespace TemuKJD.WXForms.ShopForms WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop); shopLoginForm.openType = EnumOpenType.manage; shopLoginForm.WindowState = FormWindowState.Maximized; - shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=3984039898079707139"; + shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=3984039898079707139"; // 店统领 + shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=4431685489938137094"; shopLoginForm.Show(); } break; diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs index 4377c57..aa55b2c 100644 --- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs @@ -144,7 +144,7 @@ this.ucCheckBox2.Name = "ucCheckBox2"; this.ucCheckBox2.Size = new System.Drawing.Size(51, 21); this.ucCheckBox2.TabIndex = 1; - this.ucCheckBox2.Text = "采购"; + this.ucCheckBox2.Text = "拍单"; this.ucCheckBox2.UseVisualStyleBackColor = true; // // lblForbiddenPage diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs index 89e3308..3db41e5 100644 --- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs @@ -242,6 +242,7 @@ namespace TemuKJD.WXForms.ShopForms { this.flowLayoutPanel1.Controls.Clear(); this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "客服", Text = "客服", AutoSize = true }); + this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "拍单", Text = "拍单", AutoSize = true }); this.flowLayoutPanel1.Controls.Add(new Label() { Text = "-------------------------------------", AutoSize = true }); //this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "采购", Text = "采购", AutoSize = true }); List subUserNoAuthorityPageNames = new List() { "子账号管理", "店铺地址管理", "充值二维码", "1688商品采集", "多多商品采集" }; diff --git a/Work/Initialization.cs b/Work/Initialization.cs index 19cb81e..2f268c2 100644 --- a/Work/Initialization.cs +++ b/Work/Initialization.cs @@ -283,36 +283,6 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no } } - - /// - /// 检查更新 - /// - private void Update() - { - //string upfilepath = Application.StartupPath + "\\Updatex.exe"; - //File.WriteAllText(Application.StartupPath + "\\updateconfig.ini", BaseClass.VersionCount - //+ "\r\nhttps://update.qixiaoke.com/littlerabbit_update/uploader.php"); - //if (File.Exists(upfilepath)) - //{ - // string fc = GetMD5(upfilepath); - // if (fc != "001EC5642914325F1DCF6E69BBA90738") - // { - // GetHtml.DownloadFile("http://dl.qixiaoke.com/Update3.1.exe", upfilepath); - // } - //} - //else//如果自动更新文件不存在，则强制更新主文件 - // GetHtml.DownloadFile("http://dl.qixiaoke.com/Update3.1.exe", upfilepath); - //try - //{ - // Process.Start(upfilepath); - //} - //catch - //{ - //} - - InitProgress(1); - } - public static void CheckUpdate() { try diff --git a/Work/Work.csproj b/Work/Work.csproj index 33ca326..c52e641 100644 --- a/Work/Work.csproj +++ b/Work/Work.csproj @@ -27,6 +27,7 @@ prompt 4 Off + x64 pdbonly @@ -40,7 +41,7 @@ true - bin\x64\Debug\ + ..\bin\ DEBUG;TRACE full x64 @@ -48,7 +49,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + ..\bin\ TRACE true pdbonly