店铺考核提供备注功能 微信带货助手采集功能

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1056;
+        public static int VersionCount = 1067;
         //public static int VersionCount = 613;
 
         /// <summary>
@@ -306,9 +306,14 @@ namespace AllBase
         /// 注册用户名
         /// </summary>
         public static string UserName = "";
+        /// <summary>
+        /// 子账号所属主账号
+        /// </summary>
+        public static string ParentUserName { get; set; }
         //public static bool IsSa;
         public static int SaLevel = 0;
         public static string UserAuthority = "";
+        public static string ParentAuthority = "";
         public static decimal? AuthorizedAmount = null;
         /// <summary>
         /// 注册昵称

AllBase/Model/Result/KJDDBProduct.cs

@@ -87,6 +87,7 @@ namespace AllBase.Model.Result
         // 是否拼多多上传成功
         public bool isPddUpLoad { get; set; } = false;
 
+        public int? view_uv { get; set; }
         public int? sale_count { get; set; }
         public string sale_count_text { get; set; }
         public string wx_safe_status { get; set; }

AllBase/Model/Result/WXResult/WxOptimizeExpressInfo.cs

@@ -32,4 +32,13 @@ namespace AllBase.Model.Result.WXResult
         public DateTime add_time { get; set; }
         public DateTime mdy_time { get; set; }
     }
+    public class WxOptimizeRemarkInfo
+    {
+        public int id { get; set; }
+        public string shop_id { get; set; }
+        public string order_id { get; set; }
+        public string remark { get; set; }
+        public DateTime add_time { get; set; }
+        public DateTime mdy_time { get; set; }
+    }
 }

AllBase/Model/Result/WXResult/WxOptimizeLinerCgiInfo.cs

@@ -10,6 +10,7 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string remark { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
         public int? orderTime { get; set; }

AllBase/Model/Result/WXResult/WxOptimizeOrderAfterSaleInfo.cs

@@ -10,6 +10,7 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string remark { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
         public int? orderTime { get; set; }

AllBase/Model/Result/WXResult/WxOptimizeOrderWayBillInfo.cs

@@ -10,6 +10,7 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string remark { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
         public int? orderTime { get; set; }

AllBase/Model/Result/WXResult/WxOptimizeProductEvaluationInfo.cs

@@ -10,6 +10,7 @@ namespace AllBase.Model.Result.WXResult
     {
         public string shopId { get; set; }
         public string shopName { get; set; }
+        public string remark { get; set; }
         public string optimizeWaybillId { get; set; }
         public string optimizeTime { get; set; }
         public string order_id { get; set; }

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -13,6 +13,7 @@ using System.Data;
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Web;
 using System.Web.Security;
@@ -57,11 +58,17 @@ namespace KJD_Web.BLL.BXX
                 string sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.Replace("'", "\\'");
                 string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'");
                 string distribution_set = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "distribution_set"))?.Replace("'", "\\'");
-                string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'");
-                if (special_prod_type != "爆款商品")
-                    special_prod_type = "普通商品";
                 string add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'");
-                
+                string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'");
+                if (special_prod_type != "爆款数据")
+                    special_prod_type = "普通商品";
+                string view_uv = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "view_uv"))?.Replace("'", "\\'"); // 爆款数据产品曝光数量
+                string add_hot_version = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_hot_version"))?.Replace("'", "\\'");
+                if (special_prod_type == "爆款数据" && product_get_type == "微信店采" && add_hot_version != "v3")
+                {
+                    return "{\"code\":666,\"msg\":\"当前版本已失效，请更新软件\"}";
+                }
+
                 if (string.IsNullOrEmpty(product_get_type))
                 {
                     product_get_type = "母店采集";
@@ -105,6 +112,8 @@ namespace KJD_Web.BLL.BXX
                     sql += "add_user_name,";
                 if (group != null)
                     sql += "`group`,";
+                if (!string.IsNullOrWhiteSpace(view_uv))
+                    sql += "view_uv,";
                 sql = sql.TrimEnd(',');
                 sql += ") ";
                 sql += "values ('" + from_shop_id + "','" + from_shop_name + "','" + offline_supplier_id + "','" + offline_supplier_name + "','" + spu_id + "','" +
@@ -117,6 +126,8 @@ namespace KJD_Web.BLL.BXX
                     sql += "'" + add_user_name + "',";
                 if (group != null)
                     sql += "'" + group + "',";
+                if (!string.IsNullOrWhiteSpace(view_uv))
+                    sql += "" + view_uv + ",";
                 sql = sql.TrimEnd(',');
                 sql += ");";
 
@@ -173,7 +184,7 @@ namespace KJD_Web.BLL.BXX
                 string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'");
                 string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'");
                 string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'");
-                if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款商品")
+                if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款数据")
                     special_prod_type = "普通商品";
                 string wx_cat_1 = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_cat_1"))?.Replace("'", "\\'");
                 string wx_cat_2 = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_cat_2"))?.Replace("'", "\\'");
@@ -188,6 +199,13 @@ namespace KJD_Web.BLL.BXX
                 string wx_img_map_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_img_map_json"))?.Replace("'", "\\'");
                 string problem_prod_data = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "problem_prod_data"))?.Replace("'", "\\'");
                 string is_relation = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "is_relation"))?.Replace("'", "\\'");
+                string view_uv = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "view_uv"))?.Replace("'", "\\'"); // 产品曝光数量
+                string product_get_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_get_type"))?.Replace("'", "\\'");
+                string add_hot_version = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_hot_version"))?.Replace("'", "\\'");
+                if (special_prod_type == "爆款数据" && product_get_type == "微信店采" && add_hot_version != "v3")
+                {
+                    return "{\"code\":666,\"msg\":\"当前版本已失效，请更新软件\"}";
+                }
 
                 if (string.IsNullOrEmpty(user_name))
                 {
@@ -267,6 +285,8 @@ namespace KJD_Web.BLL.BXX
                     sql += " p.problem_prod_data=" + problem_prod_data + ",";
                 if (!is_relation.IsNullOrEmpty())
                     sql += " p.is_relation=" + is_relation + ",";
+                if (!string.IsNullOrWhiteSpace(view_uv))
+                    sql += " p.view_uv=" + view_uv + ",";
                 sql += " p.mdy_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',";
                 sql = sql.TrimEnd(',');
                 sql += " where spu_id='" + spu_id + "';";
@@ -491,12 +511,13 @@ namespace KJD_Web.BLL.BXX
                 var wx_cat_3 = RegexUtils.GetStringQuery(ref inputData, "wx_cat_3")?.Replace("'", "\\'");
                 var wx_cat_leaf = RegexUtils.GetStringQuery(ref inputData, "wx_cat_leaf")?.Replace("'", "\\'");
                 var search_ext_code = RegexUtils.GetStringQuery(ref inputData, "search_ext_code")?.Replace("'", "\\'");
-                var search_prod_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "search_prod_name")?.Replace("'", "\\'"));
+                var search_prod_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "search_prod_name"))?.Replace("'", "\\'");
+                var search_prod_name_in = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "search_prod_name_in"))?.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 search_secret_spu_ids = RegexUtils.GetStringQuery(ref inputData, "search_secret_spu_ids")?.Replace("'", "\\'");
-                var ext_code_in = RegexUtils.GetStringQuery(ref inputData, "ext_code_in")?.Replace("'", "\\'");
+                var ext_code_in = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "ext_code_in"))?.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("'", "\\'");
@@ -520,6 +541,7 @@ 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("'", "\\'");
+                var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count").ParseToBool(); // 不计数
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
                 int page_size= RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
@@ -598,6 +620,10 @@ namespace KJD_Web.BLL.BXX
                     }
                     where += " and (" + multi_search_prod_name.Substring(4) + ")";
                 }
+                if (!string.IsNullOrWhiteSpace(search_prod_name_in))
+                {
+                    where += " and p.product_name in ('" + search_prod_name_in.Replace(",", "','") + "')";
+                }
                 if (!string.IsNullOrWhiteSpace(search_group))
                 {
                     if (search_group == "无分组")
@@ -684,7 +710,7 @@ namespace KJD_Web.BLL.BXX
                 sql += where;
 
                 var count = 0;
-                if (isDetail)
+                if (isDetail || is_not_count)
                     count = 1;
                 else
                     count = mySql.ExecuteRowCount(sql, paramLst.ToArray());
@@ -706,7 +732,7 @@ namespace KJD_Web.BLL.BXX
                         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.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," +
                             " 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" +
@@ -717,7 +743,7 @@ namespace KJD_Web.BLL.BXX
                         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.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" +
                             " 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 + "' " +
@@ -732,6 +758,8 @@ namespace KJD_Web.BLL.BXX
                         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")
+                        sql += " order by p.view_uv desc, p.id desc";
                     else
                         sql += " order by p.id desc";
                     sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
@@ -779,6 +807,7 @@ namespace KJD_Web.BLL.BXX
                                 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(),
                                 sale_count_text = row["sale_count_text"].ToString(),
                                 wx_safe_status = row["wx_safe_status"].ToString(),
@@ -831,6 +860,8 @@ namespace KJD_Web.BLL.BXX
                         JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
                         var data = JsonUtils.SerializeObjectToString(productLst, jsonSetting);
                         var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                        if (is_not_count)
+                            count = productLst.Count;
                         return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
                     }
                     catch (Exception ex)
@@ -1454,6 +1485,8 @@ namespace KJD_Web.BLL.BXX
                 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 = "普通商品,书籍";
                 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").ParseToBool(); // 不计数
                 var prod_count = RegexUtils.GetStringQuery(ref inputData, "prod_count").ParseToInt();
@@ -1523,9 +1556,9 @@ namespace KJD_Web.BLL.BXX
                     where += " and p.product_get_type ='" + product_get_type + "'";
                 if (!string.IsNullOrEmpty(wx_safe_status))
                     where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')";
-                //if (!string.IsNullOrEmpty(special_prod_type)) // 普通商品 爆款商品
+                //if (!string.IsNullOrEmpty(special_prod_type)) // 普通商品 爆款数据
                 //    where += " and p.special_prod_type ='" + special_prod_type + "'";
-                sql += " and p.special_prod_type in ('普通商品','书籍')";
+                where += " and p.special_prod_type in ('" + special_prod_type.Replace(",", "','") + "')";
                 // 供应商货源是否已完成初始设置
                 if (!string.IsNullOrEmpty(is_supplier_prod_ok))
                 {
@@ -1873,7 +1906,7 @@ namespace KJD_Web.BLL.BXX
                 string sku_edit_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sku_edit_json"))?.Replace("'", "\\'");
                 string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'");
                 string special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
-                if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款商品")
+                if (!string.IsNullOrEmpty(special_prod_type) && special_prod_type != "爆款数据")
                     special_prod_type = "普通商品";
 
                 if (string.IsNullOrEmpty(user_name))
@@ -3561,36 +3594,53 @@ namespace KJD_Web.BLL.BXX
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
-        public string XJGetAiImage(string inputData)
+        //public string XJGetAiImage(string inputData)
+        //{
+        //    if (string.IsNullOrEmpty(inputData))
+        //        return "{\"code\":19999,\"msg\":\"输入为空\"}";
+
+        //    if (!WXUserManage.GetSign(inputData))
+        //        return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+        //    string image_url = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "image_url"))?.ParseToString();
+        //    string word = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "word"))?.ParseToString();
+        //    if (image_url == null)
+        //        return "{\"code\":500,\"msg\":\"缺少图片地址\"}";
+        //    if (word == null)
+        //        return "{\"code\":500,\"msg\":\"缺少图片文字\"}";
+
+        //    string secret = "sadhjufhe15c4fbvFBvcvds+5sdfds@#%$xsc";
+        //    string time = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now).ToString();
+        //    string code = EncrypUtil.GetMd5(secret + time);
+
+        //    try
+        //    {
+        //        string url = "http://ai-bs.jiaotian.vip:" + RandomUtils.GetId(20010, 20021) + "/index.php?obj=public/image";
+        //        string data = "time=" + time + "&code=" + code + "&image_url=" + image_url + "&word=" + word;
+        //        string html = HttpUtils.e57GetResponse(url, "");
+        //        return html;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        return "{\"code\":50001,\"msg\":\"" + ex.Message + "\"}";
+        //    }
+        //}
+
+        public string IsGetWXRecommendHotProd(string inputData)
         {
-            if (string.IsNullOrEmpty(inputData))
-                return "{\"code\":19999,\"msg\":\"输入为空\"}";
-
-            if (!WXUserManage.GetSign(inputData))
-                return "{\"code\":999,\"msg\":\"校验失败\"}";
-
-            string image_url = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "image_url"))?.ParseToString();
-            string word = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "word"))?.ParseToString();
-            if (image_url == null)
-                return "{\"code\":500,\"msg\":\"缺少图片地址\"}";
-            if (word == null)
-                return "{\"code\":500,\"msg\":\"缺少图片文字\"}";
-
-            string secret = "sadhjufhe15c4fbvFBvcvds+5sdfds@#%$xsc";
-            string time = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now).ToString();
-            string code = EncrypUtil.GetMd5(secret + time);
-
-            try
+            if (!string.IsNullOrEmpty(inputData))
             {
-                string url = "http://ai-bs.jiaotian.vip:" + RandomUtils.GetId(20010, 20021) + "/index.php?obj=public/image";
-                string data = "time=" + time + "&code=" + code + "&image_url=" + image_url + "&word=" + word;
-                string html = HttpUtils.e57GetResponse(url, "");
-                return html;
-            }
-            catch (Exception ex)
-            {
-                return "{\"code\":50001,\"msg\":\"" + ex.Message + "\"}";
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+                var isGetReturn = System.Configuration.ConfigurationManager.ConnectionStrings["GetWXRecommendHotProd"]?.ConnectionString;
+                var isGetOnce = System.Configuration.ConfigurationManager.ConnectionStrings["GetWXRecommendHotProd"]?.ConnectionString;
+                var minViewUv = (System.Configuration.ConfigurationManager.ConnectionStrings["GetWXRecommendHotProdMinViewUv"]?.ConnectionString).ParseToInt(500);
+                var getInterval = (System.Configuration.ConfigurationManager.ConnectionStrings["GetWXRecommendHotProdInterval"]?.ConnectionString).ParseToInt(3);
+                return "{\"code\":200,\"is_get\":\"" + isGetReturn + "\",\"isGetOnce\":\"" + isGetOnce + "\"," +
+                    "\"minViewUv\":" + minViewUv + ",\"getInterval\":" + getInterval + "}";
             }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
     }
 }

KJDService/KJD_WebService/BLL/BXX/BXXUserManage.cs

@@ -3,6 +3,7 @@ using KJD_Web.Model.PddModel;
 using KJD_Web.Model.ShopModel;
 using KJD_Web.Utils;
 using NaiBa.Util.Extension;
+using NaiBa.Util.Helper;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -31,35 +32,55 @@ namespace KJD_Web.BLL.BXX
                     + mobile + "' and password='" + password + "'";
 
                 var dt = mySql.ExecuteDataTable(sql);
-                mySql.Close();
-                if (dt != null)
+                if (!string.IsNullOrEmpty(mySql.Message))
                 {
-                    foreach (DataRow row in dt.Rows)
-                    {
-                        UserLoginResultParam user = new UserLoginResultParam
-                        {
-                            id = Convert.ToInt32(row["id"]),
-                            user_name = row["user_name"].ToString(),
-                            nick_name = row["nick_name"].ToString(),
-                            mobile = row["user_name"].ToString(),
-                            password = row["password"].ToString(),
-                            group_id = row["group_id"].ToString(),
-                            card_id = row["card_id"].ToString(),
-                            company_name = row["company_name"].ToString(),
-                            is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
-                            sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
-                            authority = row["authority"].ToString(),
-                        };
-
-                        if (string.IsNullOrEmpty(user.company_name))
-                        {
-                            user.company_name = "-";
-                        }
-                        var data = JsonUtils.SerializeObjectToString(user);
-                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
-                    }
-                    return "{\"code\":1,\"msg\":\"用户名或密码错误\"}";
+                    mySql.Close();
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
                 }
+
+                if (dt == null)
+                    dt = new DataTable();
+
+                foreach (DataRow row in dt.Rows)
+                {
+                    UserLoginResultParam user = new UserLoginResultParam
+                    {
+                        id = Convert.ToInt32(row["id"]),
+                        user_name = row["user_name"].ToString(),
+                        nick_name = row["nick_name"].ToString(),
+                        mobile = row["user_name"].ToString(),
+                        password = row["password"].ToString(),
+                        group_id = row["group_id"].ToString(),
+                        card_id = row["card_id"].ToString(),
+                        company_name = row["company_name"].ToString(),
+                        is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
+                        sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
+                        authority = row["authority"].ToString(),
+                        parent_user_name = row["parent_user_name"].ToString(),
+                    };
+
+                    if (string.IsNullOrEmpty(user.company_name))
+                    {
+                        user.company_name = "-";
+                    }
+                    if (user.group_id != "3" && !string.IsNullOrEmpty(user.parent_user_name))
+                    {
+                        sql = "select authority from bxx.user where user_name='" + user.parent_user_name + "'";
+                        var rst = mySql.ExecuteFirst(sql);
+                        if (mySql.Message.IsNullOrEmpty())
+                        {
+                            user.parent_authority = rst;
+                        }
+                    }
+
+                    var data = JsonUtils.SerializeObjectToString(user);
+
+                    mySql.Close();
+                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
+                }
+                mySql.Close();
+                return "{\"code\":1,\"msg\":\"用户名或密码错误\"}";
+
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }

KJDService/KJD_WebService/BLL/WXXD/WXExpressOptimizeManage.cs

@@ -720,5 +720,158 @@ namespace KJD_Web.BLL.WXXD
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
+
+
+        public string AddMdyExpressOptimizeRemark(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+                var shop_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "shop_id"))?.Replace("'", "\\'");
+                var order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_id"))?.Replace("'", "\\'");
+                var remark = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "remark"))?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(order_id))
+                {
+                    return "{\"code\":500,\"msg\":\"请输入订单编号\"}";
+                }
+                if (remark == null)
+                {
+                    return "{\"code\":500,\"msg\":\"请输入备注内容\"}";
+                }
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+                string sql = "";
+                sql = "select exists (select 1 from wxxd.express_optimize_remark where order_id='" + order_id + "')";
+                var exist = mySql.ExecuteFirstInt(sql);
+                if (!mySql.Message.IsNullOrEmpty())
+                {
+                    mySql.Close();
+                    return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}";
+                }
+                if (exist > 0)
+                {
+                    sql = " UPDATE wxxd.express_optimize_remark SET ";
+                    if (shop_id != null)
+                        sql += " shop_id=@shop_id,";
+                    if (remark != null)
+                        sql += " remark=@remark,";
+                    sql = sql.TrimEnd(',');
+                    sql += " WHERE order_id=@order_id";
+                }
+                else
+                {
+                    sql = " insert into wxxd.express_optimize_remark (shop_id,order_id,";
+                    if (remark != null)
+                        sql += "remark,";
+                    sql = sql.TrimEnd(',');
+                    sql += ") ";
+                    sql += " values (@shop_id,@order_id,";
+                    if (remark != null)
+                        sql += "@remark,";
+                    sql = sql.TrimEnd(',');
+                    sql += ");";
+                }
+
+                List<MySqlParameter> paramLst = new List<MySqlParameter>();
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@shop_id", Value = shop_id, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@remark", Value = remark, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "@order_id", Value = order_id, });
+                var rows = mySql.ExecuteAffectedRows(sql, paramLst.ToArray());
+                mySql.Close();
+                if (!mySql.Message.IsNullOrEmpty())
+                    return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}";
+                else
+                    return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + rows + "}";
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
+
+        public string GetExpressOptimizeRemark(string inputData, bool isNoUserName = false)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var timeCalc = DateTime.Now;
+
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+
+                var order_ids = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_ids"))?.Replace("'", "\'");
+                if (isNoUserName && order_ids.IsNullOrEmpty())
+                {
+                    return "{\"code\":500,\"msg\":\"订单号不能为空\"}";
+                }
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+                string sql = "";
+                sql = "select count(*) from wxxd.express_optimize_remark where 1=1";
+
+                string where = "";
+                if (order_ids != null)
+                    where += " AND order_id in ('" + order_ids.Replace(",", "','") + "')";
+
+                sql += where;
+
+                var count = 0;
+                count = mySql.ExecuteRowCount(sql);
+
+                DataTable dt;
+                if (count == 0)
+                {
+                    dt = new DataTable();
+                }
+                else
+                {
+                    sql = "select * from wxxd.express_optimize_remark where 1=1";
+                    sql += where;
+                    sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";";
+                    dt = mySql.ExecuteDataTable(sql);
+                }
+                mySql.Close();
+
+                if (!string.IsNullOrEmpty(mySql.Message))
+                    return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}";
+
+                if (dt != null)
+                {
+                    try
+                    {
+                        List<WxOptimizeRemarkInfo> WxOptimizeRemarkInfoLst = new List<WxOptimizeRemarkInfo>();
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            WxOptimizeRemarkInfoLst.Add(new WxOptimizeRemarkInfo()
+                            {
+                                id = row["id"].ParseToInt(),
+                                order_id = row["order_id"].ParseToString(),
+                                remark = row["remark"].ParseToString(),
+                                shop_id = row["shop_id"].ParseToString(),
+                                add_time = Convert.ToDateTime(row["add_time"]),
+                                mdy_time = Convert.ToDateTime(row["mdy_time"]),
+                            });
+                        }
+                        JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+                        var data = JsonUtils.SerializeObjectToString(WxOptimizeRemarkInfoLst, jsonSetting);
+                        var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
+                    }
+                    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\":\"输入为空\"}";
+        }
     }
 }

KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs

@@ -63,50 +63,70 @@ namespace KJD_Web.BLL.WXXD
                     + mobile + "' and u.password='" + password + "'";
 
                 var dt = mySql.ExecuteDataTable(sql);
-                mySql.Close();
-                if (dt != null)
+                if (!string.IsNullOrEmpty(mySql.Message))
                 {
-                    foreach (DataRow row in dt.Rows)
-                    {
-                        UserLoginResultParam user = new UserLoginResultParam
-                        {
-                            id = Convert.ToInt32(row["id"]),
-                            user_name = row["user_name"].ToString(),
-                            nick_name = row["nick_name"].ToString(),
-                            mobile = row["user_name"].ToString(),
-                            password = row["password"].ToString(),
-                            group_id = row["group_id"].ToString(),
-                            card_id = row["card_id"].ToString(),
-                            company_name = row["company_name"].ToString(),
-                            is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
-                            sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
-                            authority = row.Table.Columns.Contains("authority") ? row["authority"].ParseToString() : "",
-                            points = row.Table.Columns.Contains("points") ? row["points"].ParseToInt() : 0,
-                        };
-                        var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
-                        // 子账号积分用户权限跟随
-                        if (user.group_id != "3")
-                        {
-                            var userAuthLst = user.authority.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
-                            if (!main_authority.Contains("积分用户"))
-                            {
-                                userAuthLst.Remove("积分用户");
-                                user.authority = string.Join(",", userAuthLst);
-                            }
-                            else if (!user.authority.Contains("积分用户"))
-                            {
-                                user.authority = (user.authority + "," + "积分用户").Trim(',');
-                            }
-                        }
-                        if (string.IsNullOrEmpty(user.company_name))
-                        {
-                            user.company_name = "-";
-                        }
-                        var data = JsonUtils.SerializeObjectToString(user);
-                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
-                    }
-                    return "{\"code\":1,\"msg\":\"用户名或密码错误\"}";
+                    mySql.Close();
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
                 }
+
+                if (dt == null)
+                    dt = new DataTable();
+
+                foreach (DataRow row in dt.Rows)
+                {
+                    UserLoginResultParam user = new UserLoginResultParam
+                    {
+                        id = Convert.ToInt32(row["id"]),
+                        user_name = row["user_name"].ToString(),
+                        nick_name = row["nick_name"].ToString(),
+                        mobile = row["user_name"].ToString(),
+                        password = row["password"].ToString(),
+                        group_id = row["group_id"].ToString(),
+                        card_id = row["card_id"].ToString(),
+                        company_name = row["company_name"].ToString(),
+                        is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
+                        sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
+                        authority = row.Table.Columns.Contains("authority") ? row["authority"].ParseToString() : "",
+                        parent_user_name = row["parent_user_name"].ToString(),
+                        points = row.Table.Columns.Contains("points") ? row["points"].ParseToInt() : 0,
+                    };
+                    var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
+                    // 子账号积分用户权限跟随
+                    if (user.group_id != "3")
+                    {
+                        var userAuthLst = user.authority.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).ToList();
+                        if (!main_authority.Contains("积分用户"))
+                        {
+                            userAuthLst.Remove("积分用户");
+                            user.authority = string.Join(",", userAuthLst);
+                        }
+                        else if (!user.authority.Contains("积分用户"))
+                        {
+                            user.authority = (user.authority + "," + "积分用户").Trim(',');
+                        }
+                    }
+                    if (string.IsNullOrEmpty(user.company_name))
+                    {
+                        user.company_name = "-";
+                    }
+                    if (user.group_id != "3" && !string.IsNullOrEmpty(user.parent_user_name))
+                    {
+                        sql = "select authority from wxxd.user where user_name='" + user.parent_user_name + "'";
+                        var rst = mySql.ExecuteFirst(sql);
+                        if (mySql.Message.IsNullOrEmpty())
+                        {
+                            user.parent_authority = rst;
+                        }
+                    }
+
+                    var data = JsonUtils.SerializeObjectToString(user);
+
+                    mySql.Close();
+                    return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"c\":\"" + EncrypUtil.Encryption(r2) + "\"}";
+                }
+                mySql.Close();
+                return "{\"code\":1,\"msg\":\"用户名或密码错误\"}";
+
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
@@ -652,6 +672,67 @@ namespace KJD_Web.BLL.WXXD
             }
         }
 
+        public string UpdateWxSaleAssistantCookie(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var id = (RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'")).ParseToInt();
+                if (id == 0)
+                    id = 1;
+                var cookie = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "cookie"))?.Replace("'", "\\'");
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+                string sql = "update wxxd.wx_sale_assistant_user set cookie='" + cookie + "' WHERE id=" + id + ";";
+
+                var rst = mySql.ExecuteNonQuery(sql);
+                mySql.Close();
+                if (rst && string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":200,\"msg\":\"success\"}";
+                }
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
+        public string GetWxSaleAssistantCookie(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var id = (RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'")).ParseToInt();
+                if (id == 0)
+                    id = 1;
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+                string sql = "select cookie from wxxd.wx_sale_assistant_user WHERE id=" + id + ";";
+
+                var rst = mySql.ExecuteDataTableRow(sql);
+                mySql.Close();
+                if (string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":200,\"cookie\":" + rst["cookie"] + "}";
+                }
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
         /// <summary>
         /// temu退回包裹的密钥
         /// </summary>

KJDService/KJD_WebService/BXXProductService.asmx.cs

@@ -602,6 +602,5 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
-        //GetJstProductCoidList
     }
 }

KJDService/KJD_WebService/Model/DBProductResultParam.cs

@@ -94,6 +94,7 @@ namespace KJD_Web.Model
         public int product_get_type { get; set; }
         public string product_get_type_text { get; set; }
 
+        public int? view_uv { get; set; }
         public int sale_count { get; set; }
         public string sale_count_text { get; set; }
         public string wx_safe_status { get; set; }

KJDService/KJD_WebService/Model/UserLoginResultParam.cs

@@ -63,6 +63,10 @@ namespace KJD_Web.Model
         /// </summary>
         public string authority { get; set; }
         /// <summary>
+        /// 父账户的功能操作权限
+        /// </summary>
+        public string parent_authority { get; set; }
+        /// <summary>
         /// 用户积分点数
         /// </summary>
         public int points { get; set; }

KJDService/KJD_WebService/Model/WxModel/WxOptimizeExpressInfo.cs

@@ -31,4 +31,14 @@ namespace KJD_Web.Model.WxModel
         public DateTime add_time { get; set; }
         public DateTime mdy_time { get; set; }
     }
+
+    public class WxOptimizeRemarkInfo
+    {
+        public int id { get; set; }
+        public string shop_id { get; set; }
+        public string order_id { get; set; }
+        public string remark { get; set; }
+        public DateTime add_time { get; set; }
+        public DateTime mdy_time { get; set; }
+    }
 }

KJDService/KJD_WebService/WXProductService.asmx.cs

@@ -325,5 +325,17 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
+
+        [WebMethod]
+        public void is_get_wx_recommend_hot_prod()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new BXXProductManage().IsGetWXRecommendHotProd(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
     }
 }

KJDService/KJD_WebService/WXShopService.asmx.cs

@@ -311,6 +311,30 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void add_mdy_express_optimize_remark()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXExpressOptimizeManage().AddMdyExpressOptimizeRemark(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
+        [WebMethod]
+        public void get_express_optimize_remark()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXExpressOptimizeManage().GetExpressOptimizeRemark(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         /// <summary>
         /// 修改店铺默认(售后)地址
         /// </summary>

KJDService/KJD_WebService/WXUserService.asmx.cs

@@ -174,5 +174,28 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
+
+        [WebMethod]
+        public void get_wx_sale_assistant_cookie()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXUserManage().GetWxSaleAssistantCookie(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+        [WebMethod]
+        public void update_wx_sale_assistant_cookie()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXUserManage().UpdateWxSaleAssistantCookie(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
     }
 }

KJDService/KJD_WebService/Web.config

@@ -13,7 +13,12 @@
     <add name="UpdateExe" connectionString="http://1.13.195.131:9000/Download/Update.exe"/>
     <add name="UpdateFiles" connectionString="http://1.13.195.131:9000/Download/Update525.zip"/>
     <add name="UpdateExeChk" connectionString="324527ACE5020DCA77D65A5037718B65"/>
-	<add name="GetReturnPackage" connectionString="true"/>
+    <add name="GetReturnPackage" connectionString="true"/>
+	<add name="GetWXRecommendHotProd" connectionString="true"/>
+	<add name="GetWXRecommendHotProdOncePerDay" connectionString="false"/>
+	<add name="GetWXRecommendHotProdMinViewUv" connectionString="200"/>
+	<add name="GetWXRecommendHotProdInterval" connectionString="3"/>
+	<add name="IsKeepBase64UploadImgFile" connectionString="0"/>
   </connectionStrings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。

TEMUKJD/BLL/WXHttpResponseBLL.cs

@@ -13,6 +13,90 @@ namespace TemuKJD.BLL
 {
     public class WXHttpResponseBLL
     {
+        //Assistant
+        public static string WeiXinAssistantPostResponse(ShopLoginInfo shop, string _url, string _data, string referer)
+        {
+            string biz_magic = "";
+            string talent_magic = "";
+            string cookies = "";
+            try
+            {
+                var cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(shop?.Cookies.ParseToString());
+                if (cookieLst == null)
+                    cookieLst = new List<CefSharp.Cookie>();
+                foreach (var cook in cookieLst)
+                {
+                    cookies += cook.Name + "=" + cook.Value + ";";
+                }
+                //var bizMagicCookie = cookieLst.FirstOrDefault(c => c.Name == "biz_magic");
+                //if (bizMagicCookie != null)
+                //    biz_magic = bizMagicCookie.Value;
+                var talentMagicCookie = cookieLst.FirstOrDefault(c => c.Name == "talent_magic");
+                if (talentMagicCookie != null)
+                    talent_magic = talentMagicCookie.Value;
+            }
+            catch { }
+
+            HttpWebResponse response = null;
+            string result;
+            try
+            {
+                string url = _url;
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
+
+                request.KeepAlive = true;
+                request.Headers.Add("wecom_magic", @"");
+                request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
+                request.Headers.Add("supplier_magic", @"");
+                request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138""");
+                request.Headers.Add("sec-ch-ua-mobile", @"?0");
+                request.Headers.Add("potter-scene", @"weixinShop");
+                request.Headers.Add("biz_magic", "");
+                request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
+                request.Accept = "application/json, text/plain, */*";
+                request.Headers.Add("talent_magic", talent_magic);
+                request.ContentType = "application/json";
+                request.Headers.Add("mcn_magic", @"");
+                request.Headers.Add("Origin", @"https://store.weixin.qq.com");
+                request.Headers.Add("Sec-Fetch-Site", @"same-origin");
+                request.Headers.Add("Sec-Fetch-Mode", @"cors");
+                request.Headers.Add("Sec-Fetch-Dest", @"empty");
+                request.Referer = referer;
+                request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd");
+                request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6");
+                request.Headers.Set(HttpRequestHeader.Cookie, cookies);
+
+                request.Method = "POST";
+                request.ServicePoint.Expect100Continue = false;
+
+                string body = _data;
+                byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body);
+                request.ContentLength = postBytes.Length;
+                Stream stream = request.GetRequestStream();
+                stream.Write(postBytes, 0, postBytes.Length);
+                stream.Close();
+
+                response = (HttpWebResponse)request.GetResponse();
+            }
+            catch (WebException ex)
+            {
+                if (ex.Status == WebExceptionStatus.ProtocolError)
+                {
+                    response = (HttpWebResponse)ex.Response;
+                    result = GetProxyHtml.ReadResponse(response);
+                    return result;
+                }
+                else return ex.Message;
+            }
+            catch (Exception e)
+            {
+                if (response != null) response.Close();
+                return e.Message;
+            }
+            result = GetProxyHtml.ReadResponse(response);
+            return result;
+        }
+
         public static string WeiXinPostResponse(ShopLoginInfo shop, string _url, string _data, string referer)
         {
             string biz_magic = "";

TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs

@@ -0,0 +1,348 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.Result;
+using AllBase.Model.Result.WXResult;
+using NaiBa.Util.Extension;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using TemuKJD.WXForms.ShopForms;
+using Work;
+
+namespace TemuKJD.BLL.Wx
+{
+    public class WxPlatformRecommendProdManage
+    {
+        public static int minViewUv { get; set; } = 500;
+        public static int getInterval { get; set; } = 3;
+        public static bool isGetOnce { get; set; } = true;
+
+        public void GetPlatformRecommendProduct()
+        {
+
+            Task.Run(() =>
+            {
+                if (!Directory.Exists("wxPlatformRecommendUpdate"))
+                    Directory.CreateDirectory("wxPlatformRecommendUpdate");
+
+                while (true)
+                {
+                    int cnt = 0;
+                    foreach (var shop in GlobalConfig.ShopLoginList)
+                    {
+                        if (shop.LoginStatus != "登录成功")
+                            continue;
+
+                        if (shop.ShopId == "wx8fd533b89195d717")
+                        {
+
+                        }
+
+                        Thread.Sleep(Randomx.GetId(500, 1500));
+
+                        WXPlatformRecommendUpdateInfo info = new WXPlatformRecommendUpdateInfo() { shopId = shop.ShopId, updateDay = DateTime.Now.ToString("yyMMdd") };
+                        try
+                        {
+                            info = NaiBa.Util.Helper.ConfigHelper.LoadConfig<WXPlatformRecommendUpdateInfo>("wxPlatformRecommendUpdate\\" + shop.ShopId);
+                            if (info == null)
+                                info = new WXPlatformRecommendUpdateInfo() { shopId = shop.ShopId, updateDay = DateTime.MinValue.ToString("yyMMdd") };
+
+                            if (info.updateDay == DateTime.Now.ToString("yyMMdd") && isGetOnce)
+                            {
+                                // 已查询过，跳过，暂时关闭改为每次打开都查询
+                                continue;
+                            }
+
+                            info.failReason = "";
+
+                            long endMs = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date) - 1;
+                            long startMs = BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-30));
+                            string result = "";
+                            for (int i = 0; i < 100; i++)
+                            {
+                                result = getPlatformRecommend(shop, startMs, endMs, i + 1);
+                                if (!result.Contains("\"code\":0"))
+                                {
+                                    WXForms.ShopForms.WXShopListForm.CheckShopLogin(shop);
+
+                                    info.failReason = "读取失败，推荐商品查询失败";
+                                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                    break;
+                                }
+                                Thread.Sleep(Randomx.GetId(500, 1500));
+
+                                try
+                                {
+                                    var jArr = JsonHelper.JObjectParse(result)["data"]["data"]["list"];
+                                    List<WXPlatformRecommendProdInfo> recommendProds = JsonHelper.DeserializeJsonToList<WXPlatformRecommendProdInfo>(JsonHelper.SerializeObject(jArr));
+                                    foreach (var recommendProd in recommendProds)
+                                    {
+                                        if (recommendProd.product_view_uv.ParseToInt() < minViewUv)
+                                        {
+                                            i = 999999;
+                                            break;
+                                        }
+
+                                        cnt++;
+                                        if (cnt % 20 == 0)
+                                        {
+                                            var url0 = BaseClass.BuildObjString("product/is_get_wx_recommend_hot_prod");
+                                            var data0 = "";
+                                            data0 = UserLogin.GetSignaturex();
+                                            var html0 = GetHtml.PostUtf8(url0, data0);
+                                            if (!html0.Contains("\"code\":200"))
+                                                html0 = GetHtml.PostUtf8(url0, data0);
+                                            if (html0.Contains("\"is_get\":\"true\""))
+                                            {
+                                                minViewUv = Math.Max(100, BaseRegex.GetIntJson(ref html0, "minViewUv"));
+                                                getInterval = Math.Max(3, BaseRegex.GetIntJson(ref html0, "getViewUvInterval"));
+                                            }
+                                            else
+                                            {
+                                                break;
+                                            }
+                                        }
+
+                                        Thread.Sleep(getInterval * 1000);
+
+                                        #region 查询爆款数据是否已存在
+                                        var url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                        var data = "";
+                                        data = UserLogin.GetSignaturex() +
+                                            "&search_prod_name_in=" + GetHtml.UrlEncodeUtf8(recommendProd.title) + //"&wx_safe_status=" + "安全商品,未校验" +
+                                            "&special_prod_type=爆款数据" +
+                                            "&is_not_count=true";
+                                        var html = GetHtml.PostUtf8(url, data);
+                                        if (!html.Contains("\"code\":200"))
+                                            html = GetHtml.PostUtf8(url, data);
+                                        if (!html.Contains("\"code\":200"))
+                                        {
+                                            info.failReason = "读取失败，库存商品查询失败";
+                                            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                            continue;
+                                        }
+                                        var prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                        List<KJDDBProduct> dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        var dbProdHotLst = dbProdLst.Where(p => p.special_prod_type == "爆款数据").ToList();
+                                        var existHotProd = dbProdHotLst.FirstOrDefault();
+                                        if (existHotProd != null) // 爆款数据商品已存在，继续
+                                            continue;
+                                        #endregion 
+
+                                        WXGetEditProductInfoLite wxProdInfoLite = null;
+                                        var rst1 = new WXShopBrowserObject().GetWxProduct(shop, recommendProd.product_id, ref wxProdInfoLite, true);
+                                        if (rst1 != "success")
+                                        {
+                                            info.failReason = "读取失败，微信商品详情查询失败";
+                                            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                            continue;
+                                        }
+                                        string spuCode = wxProdInfoLite.product.info.spuCode.ParseToString(); // 2042905570314301442
+
+                                        #region 查询原始数据
+                                        dbProdLst.Clear();
+                                        if (spuCode.Length == 19)
+                                        {
+                                            url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                            data = UserLogin.GetSignaturex() +
+                                                "&search_secret_spu_ids=" + spuCode +
+                                                "&special_prod_type=普通商品,书籍" +
+                                                "&is_not_count=true";
+                                            html = GetHtml.PostUtf8(url, data);
+                                            if (!html.Contains("\"code\":200"))
+                                            {
+                                                info.failReason = "读取失败，库存商品查询失败";
+                                                NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                                continue;
+                                            }
+                                            prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                            dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        }
+
+                                        if (dbProdLst.Count == 0 && spuCode.StartsWith("EC1") && spuCode.EndsWith("A"))
+                                        {
+                                            spuCode = spuCode.Substring(3, spuCode.Length - 4);
+                                            url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                            data = UserLogin.GetSignaturex() +
+                                                "&search_spu=" + spuCode +
+                                                "&special_prod_type=普通商品,书籍" +
+                                                "&is_not_count=true";
+                                            html = GetHtml.PostUtf8(url, data);
+                                            if (!html.Contains("\"code\":200"))
+                                            {
+                                                info.failReason = "读取失败，库存商品查询失败";
+                                                NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                                continue;
+                                            }
+                                            prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                            dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        }
+
+                                        if (dbProdLst.Count == 0 && spuCode.Length > 10)
+                                        {
+                                            url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                            data = UserLogin.GetSignaturex() +
+                                                "&ext_code_in=" + spuCode +
+                                                "&special_prod_type=普通商品,书籍" +
+                                                "&is_not_count=true";
+                                            html = GetHtml.PostUtf8(url, data);
+                                            if (!html.Contains("\"code\":200"))
+                                            {
+                                                info.failReason = "读取失败，库存商品查询失败";
+                                                NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                                continue;
+                                            }
+                                            prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                            dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        }
+
+                                        if (dbProdLst.Count == 0)
+                                        {
+                                            url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                            data = UserLogin.GetSignaturex() +
+                                                "&search_prod_name_in=" + GetHtml.UrlEncodeUtf8(recommendProd.title) +
+                                                "&special_prod_type=普通商品,书籍" +
+                                                "&is_not_count=true";
+                                            html = GetHtml.PostUtf8(url, data);
+                                            if (!html.Contains("\"code\":200"))
+                                            {
+                                                info.failReason = "读取失败，库存商品查询失败";
+                                                NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                                continue;
+                                            }
+                                            prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                            dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        }
+
+                                        if (dbProdLst.Count == 0 && spuCode.Length > 10)
+                                        {
+                                            url = BaseClass.BuildPDDObjString("product/get_product_list");
+                                            data = UserLogin.GetSignaturex() +
+                                                "&ext_code_in=" + GetHtml.UrlEncodeUtf8(recommendProd.title) +
+                                                "&special_prod_type=普通商品,书籍" +
+                                                "&is_not_count=true";
+                                            html = GetHtml.PostUtf8(url, data);
+                                            if (!html.Contains("\"code\":200"))
+                                            {
+                                                info.failReason = "读取失败，库存商品查询失败";
+                                                NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                                continue;
+                                            }
+                                            prodObjs = JsonHelper.JObjectParse(html)["data"];
+                                            dbProdLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.SerializeObject(prodObjs));
+                                        }
+                                        #endregion 
+
+                                        var dbProdNormalLst = dbProdLst.Where(p => p.special_prod_type != "爆款数据").ToList();
+                                        var normalJstProd = dbProdNormalLst
+                                            .FirstOrDefault(p => p.product_get_type_text == "厂商直采" && p.secret_spu_id == wxProdInfoLite.product.info.spuCode);
+
+                                        string prodId = recommendProd.product_id;
+                                        string coid = normalJstProd?.skc_id;
+                                        string real_coid = string.IsNullOrEmpty(normalJstProd?.real_coid) ? coid : normalJstProd?.real_coid;
+                                        string wx_safe_status = !dbProdNormalLst.Any(p => p.wx_safe_status == "违规商品") ? "安全商品" : "违规商品";
+                                        int? view_uv = recommendProd.product_view_uv.IsNullOrEmpty() ? (int?)null : recommendProd.product_view_uv.ParseToInt();
+                                        var rst2 = new WXShopBrowserObject()
+                                            .SaveWxProd(shop, prodId, wxProdInfoLite, "爆款数据", coid, real_coid, view_uv, wx_safe_status);
+
+                                        if (!rst2.Contains("微信商品采集入库成功"))
+                                        {
+                                            info.failReason = "查询失败，" + rst2;
+                                            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                            continue;
+                                        }
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    info.failReason = "读取失败" + ex.Message;
+                                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                                    continue;
+                                }
+
+                                var total = BaseRegex.GetIntJson(ref result, "list_total");
+                                var totalPage = Math.Ceiling(1.0m * total / 10).ParseToInt();
+                                if (totalPage <= i + 1)
+                                {
+                                    break;
+                                }
+                            }
+                            if (!result.Contains("\"code\":0"))
+                                continue;
+
+                            if (string.IsNullOrEmpty(info.failReason))
+                                info.updateDay = DateTime.Now.ToString("yyMMdd");
+                            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wxPlatformRecommendUpdate\\" + shop.ShopId, info);
+                        }
+                        catch (Exception ex)
+                        {
+
+                        }
+                    }
+
+                    // 不循环获取
+                    break;
+                }    
+            });
+        }
+
+        public static string getPlatformRecommend(ShopLoginInfo shop, long startMs, long endMs, int page = 1, int pageSize = 10, int dateRange = 30)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradebase/cgi/shop/getShopRecommendProducts?token=&lang=zh_CN";
+            string data = @"{""isToday"":false,""offset"":" + Math.Max(0, page - 1) * pageSize + @",""limit"":" + pageSize + @",""sort"":[""product_view_uv"",""desc""]," + 
+                @"""time_query"":{""dateFormat"":2,""dateType"":0,""dateRange"":" + dateRange + @",""startMs"":" + startMs + @",""endMs"":" + endMs + @"}}";
+            // 不含当天
+            //{"isToday":false,"offset":0,"limit":10,"sort":["product_view_uv","desc"],"time_query":{"dateFormat":2,"dateType":0,"dateRange":7,"startMs":1777996800000,"endMs":1778601599999}}
+            //{"isToday":false,"offset":0,"limit":10,"sort":["product_view_uv","desc"],"time_query":{"dateFormat":2,"dateType":0,"dateRange":30,"startMs":1775836800000,"endMs":1778428799999}}
+            string referer = "https://store.weixin.qq.com/shop/platformrecommend/recommendationFeed";
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, referer);
+            return result;
+        }
+    }
+
+    public class WXPlatformRecommendUpdateInfo
+    {
+        public string shopId { get; set; }
+        public string updateDay { get; set; } // yyMMdd
+        public string failReason { get; set; } // "", "掉线"...
+    }
+
+    public class WXPlatformRecommendProdInfo
+    {
+        public string title { get; set; } // "微喇西装裤女春夏2026新款高腰垂感修身显瘦时尚休闲宽松喇叭裤子",
+        public string product_id { get; set; } // "10000675790067",
+        public string img_url { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69cbce98000dfa510ed4e417e15f1b15000000a100004f50",
+        public int? market_price { get; set; } // 3190,
+        public int? selling_price { get; set; } // 3190,
+        public int? status { get; set; } // 1,
+        public string pay_order_cnt { get; set; } // "20", // 支付订单数
+        public string product_view_to_click_uv_ratio { get; set; } // "0.036331", // 曝光点击率
+        public string product_view_to_click_cnt_ratio { get; set; } // "0.032594",
+        public string product_view_cnt { get; set; } // "12855",
+        public string product_click_to_pay_cnt_ratio { get; set; } // "0.047733",
+        public string product_click_uv { get; set; } // "400", // 点击人数
+        public string product_click_to_pay_uv_ratio { get; set; } // "0.05", // 点击转化率
+        public string pay_uv { get; set; } // "20", // 支付人数
+        public string pay_product_cnt { get; set; } // "20",
+        public string pay_gmv { get; set; } // "61800", // 支付金额，单位分
+        public string product_view_uv { get; set; } // "11010", // 曝光人数
+        public string product_click_cnt { get; set; } // "419", // 商品点击数
+        public string pay_order_cnt_hb { get; set; } // "",
+        public string product_view_to_click_uv_ratio_hb { get; set; } // "",
+        public string product_view_to_click_cnt_ratio_hb { get; set; } // "",
+        public string product_view_cnt_hb { get; set; } // "134.315789",
+        public string product_click_to_pay_cnt_ratio_hb { get; set; } // "",
+        public string product_click_uv_hb { get; set; } // "",
+        public string product_click_to_pay_uv_ratio_hb { get; set; } // "",
+        public string pay_uv_hb { get; set; } // "",
+        public string pay_product_cnt_hb { get; set; } // "",
+        public string pay_gmv_hb { get; set; } // "",
+        public string product_view_uv_hb { get; set; } // "117.387097",
+        public string product_click_cnt_hb { get; set; } // ""
+
+    }
+}

TEMUKJD/KJD.csproj

@@ -133,6 +133,7 @@
     <Compile Include="BLL\VDian\VDianUpProdMappingBLL.cs" />
     <Compile Include="BLL\VDian\VDianProductBLL.cs" />
     <Compile Include="BLL\WxApiBLL.cs" />
+    <Compile Include="BLL\Wx\WxPlatformRecommendProdManage.cs" />
     <Compile Include="BLL\YkdHttpResponseBLL.cs" />
     <Compile Include="BLL\WXHttpResponseBLL.cs" />
     <Compile Include="BLL\WxProdFormConverter.cs" />
@@ -269,6 +270,12 @@
     <Compile Include="VDianForms\VDianUploadProductForm.designer.cs">
       <DependentUpon>VDianUploadProductForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="WXForms\AdminForms\WXSaleAssistantForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\AdminForms\WXSaleAssistantForm.Designer.cs">
+      <DependentUpon>WXSaleAssistantForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="WXForms\AdminForms\WXAdminAddressSyncForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -281,6 +288,12 @@
     <Compile Include="WXForms\AdminForms\WXWaybillManageForm.Designer.cs">
       <DependentUpon>WXWaybillManageForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="WXForms\ProductForms\WXProdClearNoVisitForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\ProductForms\WXProdClearNoVisitForm.Designer.cs">
+      <DependentUpon>WXProdClearNoVisitForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="WXForms\ProductForms\WXUserCollectAuthProdListForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1320,6 +1333,9 @@
     <EmbeddedResource Include="VDianForms\VDianUploadProductForm.resx">
       <DependentUpon>VDianUploadProductForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\AdminForms\WXSaleAssistantForm.resx">
+      <DependentUpon>WXSaleAssistantForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WXForms\AdminForms\WXAdminAddressSyncForm.resx">
       <DependentUpon>WXAdminAddressSyncForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -1344,6 +1360,9 @@
     <EmbeddedResource Include="WXForms\AdminForms\WXWaybillManageForm.resx">
       <DependentUpon>WXWaybillManageForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\ProductForms\WXProdClearNoVisitForm.resx">
+      <DependentUpon>WXProdClearNoVisitForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WXForms\ProductForms\WXUserCollectAuthProdListForm.resx">
       <DependentUpon>WXUserCollectAuthProdListForm.cs</DependentUpon>
     </EmbeddedResource>

TEMUKJD/PDDForms/AdminForms/PDDAdminShopLoginForm.cs

@@ -534,7 +534,7 @@ namespace TemuKJD.PDDForms.AdminForms
             {
                 GetAntiContentsTimes++;
                 shop.AntiContents.Add(antiContent);
-                while (shop.AntiContents.Count > 100)
+                while (shop.AntiContents.Count > 200)
                     shop.AntiContents.RemoveAt(0);
                 if (!string.IsNullOrEmpty(shop.ShopId) && GetAntiContentsTimes > 500)
                 {

TEMUKJD/PDDForms/ProductForms/ActivityForms/PDDAddActivityForm.cs

@@ -2705,7 +2705,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
             }
             else
                 dicShopGetCount[shop]++;
-            if (dicShopGetCount[shop] > 5)
+            if (dicShopGetCount[shop] > 3 || shop.AntiContents.Count < 198)
             {
                 dicShopGetCount[shop] = 0;
 
@@ -2726,7 +2726,7 @@ namespace TemuKJD.PDDForms.ProductForms.ActivityForms
                     MainForm.instance.cefPanel.Controls.Add(loginForm);
                     loginForm.Show();
                 }));
-                Thread.Sleep(Randomx.GetId(3000, 5000));
+                Thread.Sleep(Randomx.GetId(5000, 6000));
                 Invoke(new Action(() =>
                 {
                     MainForm.instance.cefPanel.SendToBack();

TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs

@@ -15,9 +15,10 @@ using Work;
 
 namespace TemuKJD.PDDForms.ProductForms
 {
+    // 微信店铺违规商品抓取
     public class WXProdViolationManage
     {
-        public static void GetShopProdViolation()
+        public void GetShopProdViolation()
         {
             Task.Run(() =>
             {

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs

@@ -115,6 +115,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             var data = "";
 
             data = UserLogin.GetSignaturex() + "&search_db_ids=" + prodDbId;
+            if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
+                data += "&special_prod_type=普通商品,书籍,爆款数据";
 
             var html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs

@@ -155,6 +155,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colAddTimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colViewUv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colHeadWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -1033,7 +1034,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.FormattingEnabled = true;
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
-            "认领总数"});
+            "曝光量"});
             this.cmbSort.Location = new System.Drawing.Point(399, 40);
             this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSort.Name = "cmbSort";
@@ -1565,6 +1566,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colEdit,
             this.colAddTimes,
             this.colSelectTotalCount,
+            this.colViewUv,
             this.colSaleCount,
             this.col_notes,
             this.colHeadWords,
@@ -1762,9 +1764,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colSelectTotalCount.ReadOnly = true;
             this.colSelectTotalCount.Visible = false;
             // 
+            // colViewUv
+            // 
+            this.colViewUv.FillWeight = 60F;
+            this.colViewUv.HeaderText = "曝光量";
+            this.colViewUv.Name = "colViewUv";
+            this.colViewUv.ReadOnly = true;
+            // 
             // colSaleCount
             // 
-            this.colSaleCount.FillWeight = 80F;
+            this.colSaleCount.FillWeight = 60F;
             this.colSaleCount.HeaderText = "销量";
             this.colSaleCount.Name = "colSaleCount";
             this.colSaleCount.ReadOnly = true;
@@ -2014,6 +2023,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.ComboBox cmbCat3;
+        private UserComponent.UcCheckBox chkWXComplateProd;
+        private DevComponents.DotNetBar.PanelEx btnReturnSecretData;
+        private System.Windows.Forms.ComboBox cmbHasReturn;
+        private System.Windows.Forms.Label label18;
+        private DevComponents.DotNetBar.PanelEx btnUpdateReturnServerData;
+        private UserComponent.UcCheckBox ucCheckBox1;
+        private System.Windows.Forms.DateTimePicker dtpEnd;
+        private System.Windows.Forms.DateTimePicker dtpStart;
+        private DevComponents.DotNetBar.PanelEx panelEx1;
+        private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+        private System.Windows.Forms.ComboBox cmbPddRelation;
+        private System.Windows.Forms.Label label19;
+        private DevComponents.DotNetBar.PanelEx btnExportIdImg;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
         private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId;
@@ -2035,6 +2061,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.DataGridViewLinkColumn colEdit;
         private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes;
         private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colViewUv;
         private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn col_notes;
         private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords;
@@ -2048,22 +2075,5 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.DataGridViewLinkColumn col_edit;
         private System.Windows.Forms.DataGridViewLinkColumn col_delete;
         private System.Windows.Forms.DataGridViewLinkColumn col_select_product;
-        private UserComponent.UcCheckBox chkWXComplateProd;
-        private DevComponents.DotNetBar.PanelEx btnReturnSecretData;
-        private System.Windows.Forms.ComboBox cmbHasReturn;
-        private System.Windows.Forms.Label label18;
-        private DevComponents.DotNetBar.PanelEx btnUpdateReturnServerData;
-        private UserComponent.UcCheckBox ucCheckBox1;
-        private System.Windows.Forms.DateTimePicker dtpEnd;
-        private System.Windows.Forms.DateTimePicker dtpStart;
-        private DevComponents.DotNetBar.PanelEx panelEx1;
-        private TemuKJD.UserControls.UcTabControlMetro ucTabControlMetro1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-        private System.Windows.Forms.ComboBox cmbPddRelation;
-        private System.Windows.Forms.Label label19;
-        private DevComponents.DotNetBar.PanelEx btnExportIdImg;
     }
 }

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs

@@ -144,6 +144,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     this.pbLoading.Visible = true;
                     this.dgvDbProduct.Rows.Clear();
                     lstTemuDbProduct.Clear();
+                    dgvDbProduct.Columns["colViewUv"].Visible = false;
                 }));
             }
             else
@@ -151,6 +152,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 this.pbLoading.Visible = true;
                 this.dgvDbProduct.Rows.Clear();
                 lstTemuDbProduct.Clear();
+                dgvDbProduct.Columns["colViewUv"].Visible = false;
             }
             Task.Run(() =>
             {
@@ -170,6 +172,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     // 清除整个Bitmap为白色
                     g.Clear(Color.White);
                 }
+                Invoke(new Action(() =>
+                {
+                    if (lstTemuDbProduct.Any(p => p.view_uv != null))
+                        dgvDbProduct.Columns["colViewUv"].Visible = true;
+                }));
                 foreach (var prod in lstTemuDbProduct)
                 {
                     string catName = prod.cat_name ?? prod.cat_id;
@@ -229,6 +236,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                             "编辑",
                             prod.select_count,
                             prod.select_total_count,
+                            prod.view_uv,
                             prod.sale_count_text, // 销售数量
                             prod.notes,
                             prod.head_words,
@@ -397,6 +405,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 {
                     data += "&sort_field=select_total_count";
                 }
+                else if (this.cmbSort.Text == "曝光量")
+                {
+                    data += "&sort_field=view_uv";
+                }
                 if (!this.txtRealCoid.Text.Trim().IsNullOrEmpty())
                 {
                     data += "&real_coid=" + this.txtRealCoid.Text.Trim();

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx

@@ -180,6 +180,9 @@
   <metadata name="colSelectTotalCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colViewUv.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colSaleCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs

@@ -30,17 +30,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle89 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle90 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle92 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle93 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle94 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle95 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle96 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
-            this.cmbCatSelect3 = new System.Windows.Forms.ComboBox();
             this.cmbCatSelect2 = new System.Windows.Forms.ComboBox();
             this.cmbCatSelect1 = new System.Windows.Forms.ComboBox();
             this.btnSeachPicUp = new DevComponents.DotNetBar.PanelEx();
@@ -96,6 +95,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.chkAiImage = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.cmbCatSelect4 = new System.Windows.Forms.ComboBox();
             this.chkSetCats = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.cmbCatSelect3 = new System.Windows.Forms.ComboBox();
             this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
             this.chkRelation = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.cmbCateFilter3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
@@ -147,9 +147,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.txtUpgradeVersionName = new System.Windows.Forms.TextBox();
             this.btnGetCats = new DevComponents.DotNetBar.PanelEx();
-            this.chkImgChanceTest = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.txtLowPriceSkuPrice = new System.Windows.Forms.TextBox();
-            this.panel2 = new System.Windows.Forms.Panel();
             this.txtLowPriceSkuName = new System.Windows.Forms.TextBox();
             this.pbSkuImg = new System.Windows.Forms.PictureBox();
             this.chk15996 = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -171,6 +169,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label3 = new System.Windows.Forms.Label();
             this.pbUpgradeVersion = new System.Windows.Forms.PictureBox();
             this.lblUpgradeVersion = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
             this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -198,6 +197,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
             this.btnClear = new DevComponents.DotNetBar.PanelEx();
             this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.chkImgChanceTest = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.panel1 = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -316,18 +316,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.ucGroupBoxEx2.TabStop = false;
             this.ucGroupBoxEx2.Text = "商品上传";
             // 
-            // cmbCatSelect3
-            // 
-            this.cmbCatSelect3.DropDownWidth = 150;
-            this.cmbCatSelect3.FormattingEnabled = true;
-            this.cmbCatSelect3.Location = new System.Drawing.Point(793, 106);
-            this.cmbCatSelect3.Name = "cmbCatSelect3";
-            this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25);
-            this.cmbCatSelect3.TabIndex = 894;
-            this.cmbCatSelect3.Visible = false;
-            this.cmbCatSelect3.SelectedIndexChanged += new System.EventHandler(this.cmbCatSelect3_SelectedIndexChanged);
-            this.cmbCatSelect3.TextChanged += new System.EventHandler(this.cmbCatSelect3_TextChanged);
-            // 
             // cmbCatSelect2
             // 
             this.cmbCatSelect2.DropDownWidth = 150;
@@ -1055,6 +1043,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.chkSetCats.UseVisualStyleBackColor = true;
             this.chkSetCats.Visible = false;
             // 
+            // cmbCatSelect3
+            // 
+            this.cmbCatSelect3.DropDownWidth = 150;
+            this.cmbCatSelect3.FormattingEnabled = true;
+            this.cmbCatSelect3.Location = new System.Drawing.Point(793, 106);
+            this.cmbCatSelect3.Name = "cmbCatSelect3";
+            this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25);
+            this.cmbCatSelect3.TabIndex = 894;
+            this.cmbCatSelect3.Visible = false;
+            this.cmbCatSelect3.SelectedIndexChanged += new System.EventHandler(this.cmbCatSelect3_SelectedIndexChanged);
+            this.cmbCatSelect3.TextChanged += new System.EventHandler(this.cmbCatSelect3_TextChanged);
+            // 
             // ucGroupBoxEx4
             // 
             this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -1661,19 +1661,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.dgvShop.AllowUserToAddRows = false;
             this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle89.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle89;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvShop.AutoRowNumber = true;
             this.dgvShop.BackgroundColor = System.Drawing.Color.White;
             this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle90.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle90.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle90.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle90.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle90.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle90.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle90.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle90;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -1824,18 +1824,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnGetCats.Visible = false;
             this.btnGetCats.Click += new System.EventHandler(this.btnGetCats_Click);
             // 
-            // chkImgChanceTest
-            // 
-            this.chkImgChanceTest.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.chkImgChanceTest.AutoSize = true;
-            this.chkImgChanceTest.Location = new System.Drawing.Point(120, 2);
-            this.chkImgChanceTest.Name = "chkImgChanceTest";
-            this.chkImgChanceTest.Size = new System.Drawing.Size(99, 21);
-            this.chkImgChanceTest.TabIndex = 846;
-            this.chkImgChanceTest.Text = "模拟传款调试";
-            this.chkImgChanceTest.UseVisualStyleBackColor = true;
-            this.chkImgChanceTest.Visible = false;
-            // 
             // txtLowPriceSkuPrice
             // 
             this.txtLowPriceSkuPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -1848,16 +1836,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtLowPriceSkuPrice.Visible = false;
             this.txtLowPriceSkuPrice.TextChanged += new System.EventHandler(this.txtLowPriceSkuPrice_TextChanged);
             // 
-            // panel2
-            // 
-            this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panel2.Location = new System.Drawing.Point(345, 217);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(881, 123);
-            this.panel2.TabIndex = 842;
-            // 
             // txtLowPriceSkuName
             // 
             this.txtLowPriceSkuName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -2128,23 +2106,33 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.lblUpgradeVersion.Visible = false;
             this.lblUpgradeVersion.Click += new System.EventHandler(this.lblUpgradeVersion_Click);
             // 
+            // panel2
+            // 
+            this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panel2.Location = new System.Drawing.Point(345, 217);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(881, 123);
+            this.panel2.TabIndex = 842;
+            // 
             // dgvSelectProduct
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
             this.dgvSelectProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle91.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle91;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvSelectProduct.AutoRowNumber = true;
             this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
             this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle92.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle92.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle92.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle92.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle92.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle92.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle92.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle92;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCheck,
@@ -2206,8 +2194,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colSupplierName
             // 
-            dataGridViewCellStyle93.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle93;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
             this.colSupplierName.Frozen = true;
             this.colSupplierName.HeaderText = "店铺名称";
             this.colSupplierName.Name = "colSupplierName";
@@ -2285,8 +2273,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colProductName
             // 
-            dataGridViewCellStyle94.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle94;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
             this.colProductName.HeaderText = "商品标题";
             this.colProductName.Name = "colProductName";
             this.colProductName.ReadOnly = true;
@@ -2346,8 +2334,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colAddTime
             // 
-            dataGridViewCellStyle95.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle95;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle7;
             this.colAddTime.FillWeight = 80F;
             this.colAddTime.HeaderText = "上传时间";
             this.colAddTime.Name = "colAddTime";
@@ -2355,8 +2343,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colOpResult
             // 
-            dataGridViewCellStyle96.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOpResult.DefaultCellStyle = dataGridViewCellStyle96;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOpResult.DefaultCellStyle = dataGridViewCellStyle8;
             this.colOpResult.HeaderText = "操作结果";
             this.colOpResult.Name = "colOpResult";
             this.colOpResult.ReadOnly = true;
@@ -2444,6 +2432,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.panelEx1.Text = "停止当前操作";
             this.panelEx1.Visible = false;
             // 
+            // chkImgChanceTest
+            // 
+            this.chkImgChanceTest.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.chkImgChanceTest.AutoSize = true;
+            this.chkImgChanceTest.Location = new System.Drawing.Point(120, 2);
+            this.chkImgChanceTest.Name = "chkImgChanceTest";
+            this.chkImgChanceTest.Size = new System.Drawing.Size(99, 21);
+            this.chkImgChanceTest.TabIndex = 846;
+            this.chkImgChanceTest.Text = "模拟传款调试";
+            this.chkImgChanceTest.UseVisualStyleBackColor = true;
+            this.chkImgChanceTest.Visible = false;
+            // 
             // panel1
             // 
             this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs

@@ -305,7 +305,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             Task.Run(() =>
             {
                 // 同时刷新下商品分组
-                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, "", "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin");
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, "", "", addUserName);
 
                 // 刷新类目信息
                 GetPddProductCate();
@@ -1684,7 +1687,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             prodParam.origin_is_pre_sale = 0;
 
             var extCode = dbProd.ext_code.IsNullOrEmpty() ? prodInfo.detail.out_goods_sn : dbProd.ext_code;
-            if (extCode.IsNullOrEmpty() || extCode.Length < 4)
+            if (extCode.IsNullOrEmpty() || extCode.Length <= 10)
                 extCode = "EC1" + dbProd.spu_id + "A";
             prodParam.out_goods_sn = extCode; //prodInfo.detail.out_goods_sn;
 
@@ -6259,7 +6262,10 @@ Content-Type: image/jpeg
                 data += "&in_spu_ids=" + txtIdFilter.Text;
                 data += "&in_groups=" + cmbGroupFilter.Text;
 
-                data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin");
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                data += "&add_user_name=" + addUserName;
 
                 if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
                 {
@@ -7573,7 +7579,7 @@ Content-Type: image/jpeg
             pddApi.Data["market_price"] = prodInfo.detail.market_price;
 
             var extCode = dbProd.ext_code.IsNullOrEmpty() ? prodInfo.detail.out_goods_sn : dbProd.ext_code;
-            if (extCode.IsNullOrEmpty() || extCode.Length < 4)
+            if (extCode.IsNullOrEmpty() || extCode.Length <= 10)
                 extCode = "EC1" + dbProd.spu_id + "A";
             pddApi.Data["out_goods_id"] = extCode;
 
@@ -9873,7 +9879,7 @@ Content-Type: image/jpeg
                 pddApi.Data["order_limit"] = prodRstObj["order_limit"];
                 pddApi.Data["origin_country_id"] = prodRstObj["origin_country_id"];
                 var extCode = dbProd.ext_code.IsNullOrEmpty() ? prodInfo.detail.out_goods_sn : dbProd.ext_code;
-                if (extCode.IsNullOrEmpty() || extCode.Length < 4)
+                if (extCode.IsNullOrEmpty() || extCode.Length <= 10)
                     extCode = "EC1" + dbProd.spu_id + "A";
                 pddApi.Data["out_goods_id"] = extCode; //prodRstObj["out_goods_id"];
                 if (!prodRstObj["out_source_goods_id"].IsJTokenNullOrEmpty())

TEMUKJD/PDDForms/ShopForms/PDDShopListForm.Designer.cs

@@ -229,7 +229,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.ForeColor = System.Drawing.Color.OrangeRed;
-            this.label5.Location = new System.Drawing.Point(1, 42);
+            this.label5.Location = new System.Drawing.Point(3, 42);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(596, 17);
             this.label5.TabIndex = 822;

TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs

@@ -701,7 +701,7 @@ namespace TemuKJD.PDDForms.ShopForms
                                 try { this.TitleText = "店铺登录 - " + GetAntiContentsTimes; } catch { return; }
                         }));
                     shop.AntiContents.Add(antiContent);
-                    while (shop.AntiContents.Count > 100)
+                    while (shop.AntiContents.Count > 200)
                         shop.AntiContents.RemoveAt(0);
                     if (!string.IsNullOrEmpty(shop.ShopId) && GetAntiContentsTimes > 500)
                     {

TEMUKJD/StartUp.cs

@@ -25,6 +25,7 @@ using TemuKJD.KJDForms.AdminForms;
 using TemuKJD.BLL.PddApi;
 using TemuKJD.PDDForms.ProductForms;
 using TemuKJD.WXForms.ShopForms;
+using TemuKJD.BLL.Wx;
 
 namespace TemuKJD
 {
@@ -206,7 +207,41 @@ namespace TemuKJD
                 if (BaseClass.MainPath != "weixin") // 微信才读取违规商品信息
                     return;
 
-                WXProdViolationManage.GetShopProdViolation();
+                new WXProdViolationManage().GetShopProdViolation();
+            });
+
+            #endregion
+
+            #region 微信小店读取店采爆款数据商品信息
+
+            Task.Run(() =>
+            {
+                while (!IsShopInit)
+                {
+                    Thread.Sleep(1000);
+                }
+                while (MainForm.instance.Visible != true)
+                {
+                    Thread.Sleep(1000);
+
+                    if (WXForms.TalkForms.WxTalkForm.instance != null) // 客服不读取
+                        return;
+                }
+
+                if (BaseClass.MainPath != "weixin") // 微信读取
+                    return;
+
+                var url = BaseClass.BuildObjString("product/is_get_wx_recommend_hot_prod");
+                var data = "";
+                data = UserLogin.GetSignaturex();
+                var html = GetHtml.PostUtf8(url, data);
+                if (html.Contains("\"is_get\":\"true\""))
+                {
+                    WxPlatformRecommendProdManage.minViewUv = Math.Max(100, BaseRegex.GetIntJson(ref html, "minViewUv"));
+                    WxPlatformRecommendProdManage.getInterval = Math.Max(3, BaseRegex.GetIntJson(ref html, "getViewUvInterval"));
+                    WxPlatformRecommendProdManage.isGetOnce =  BaseRegex.GetBoolJson(ref html, "isGetOnce");
+                    new WxPlatformRecommendProdManage().GetPlatformRecommendProduct();
+                }
             });
 
             #endregion 

TEMUKJD/ToolForms/GetJuShuitanProdForm.Designer.cs

@@ -164,7 +164,7 @@ namespace TemuKJD.ToolForms
             this.splitContainer2.Panel1.Controls.Add(this.btnNext);
             this.splitContainer2.Panel1.Controls.Add(this.btnPrev);
             this.splitContainer2.Panel1.Controls.Add(this.txtAddress);
-            this.splitContainer2.Size = new System.Drawing.Size(1390, 427);
+            this.splitContainer2.Size = new System.Drawing.Size(1390, 430);
             this.splitContainer2.SplitterDistance = 26;
             this.splitContainer2.TabIndex = 6;
             // 
@@ -203,7 +203,7 @@ namespace TemuKJD.ToolForms
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(673, 195);
+            this.pbLoading.Location = new System.Drawing.Point(673, 191);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -250,7 +250,7 @@ namespace TemuKJD.ToolForms
             this.dgvProduct.Name = "dgvProduct";
             this.dgvProduct.ReadOnly = true;
             this.dgvProduct.RowTemplate.Height = 23;
-            this.dgvProduct.Size = new System.Drawing.Size(1390, 436);
+            this.dgvProduct.Size = new System.Drawing.Size(1390, 429);
             this.dgvProduct.TabIndex = 7;
             this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick);
             // 
@@ -407,7 +407,7 @@ namespace TemuKJD.ToolForms
             this.splitContainer1.Panel2.Controls.Add(this.label2);
             this.splitContainer1.Panel2.Controls.Add(this.line1);
             this.splitContainer1.Size = new System.Drawing.Size(1404, 561);
-            this.splitContainer1.SplitterDistance = 465;
+            this.splitContainer1.SplitterDistance = 468;
             this.splitContainer1.SplitterWidth = 3;
             this.splitContainer1.TabIndex = 4;
             // 
@@ -424,7 +424,7 @@ namespace TemuKJD.ToolForms
             this.ucTabControlMetro1.Name = "ucTabControlMetro1";
             this.ucTabControlMetro1.SelectedIndex = 0;
             this.ucTabControlMetro1.ShowCloseButton = false;
-            this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 465);
+            this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 468);
             this.ucTabControlMetro1.TabIndex = 462;
             this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray;
@@ -436,7 +436,7 @@ namespace TemuKJD.ToolForms
             this.tabPage1.Location = new System.Drawing.Point(4, 28);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1396, 433);
+            this.tabPage1.Size = new System.Drawing.Size(1396, 436);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "商品页面";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -448,7 +448,7 @@ namespace TemuKJD.ToolForms
             this.tabPage2.Location = new System.Drawing.Point(4, 28);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1396, 442);
+            this.tabPage2.Size = new System.Drawing.Size(1396, 435);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "采集列表";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -458,7 +458,7 @@ namespace TemuKJD.ToolForms
             this.tabPage3.Controls.Add(this.splitContainer3);
             this.tabPage3.Location = new System.Drawing.Point(4, 28);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(1396, 442);
+            this.tabPage3.Size = new System.Drawing.Size(1396, 435);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "下架SKU查询";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -490,7 +490,7 @@ namespace TemuKJD.ToolForms
             // 
             this.splitContainer3.Panel2.Controls.Add(this.pictureBox1);
             this.splitContainer3.Panel2.Controls.Add(this.dgvDownSku);
-            this.splitContainer3.Size = new System.Drawing.Size(1396, 442);
+            this.splitContainer3.Size = new System.Drawing.Size(1396, 435);
             this.splitContainer3.SplitterDistance = 82;
             this.splitContainer3.TabIndex = 0;
             // 
@@ -648,7 +648,7 @@ namespace TemuKJD.ToolForms
             // 
             this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pictureBox1.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pictureBox1.Location = new System.Drawing.Point(673, 153);
+            this.pictureBox1.Location = new System.Drawing.Point(673, 149);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(50, 50);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -697,7 +697,7 @@ namespace TemuKJD.ToolForms
             this.dgvDownSku.Name = "dgvDownSku";
             this.dgvDownSku.ReadOnly = true;
             this.dgvDownSku.RowTemplate.Height = 23;
-            this.dgvDownSku.Size = new System.Drawing.Size(1396, 356);
+            this.dgvDownSku.Size = new System.Drawing.Size(1396, 349);
             this.dgvDownSku.TabIndex = 8;
             // 
             // colDownSelect

TEMUKJD/ToolForms/GetJuShuitanProdForm.cs

@@ -43,7 +43,7 @@ namespace TemuKJD.ToolForms
         private string appVersion = "";
         private string currentSupplierId = "";
         int pageStart = 1;
-        int pageEnd = 9999;
+        int pageEnd = 99999;
         int filterSaleCountDays = 7;
         int filterSaleCount = 100;
         string platformType = "Pinduoduo";

TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs

@@ -87,6 +87,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.chkHot = new TemuKJD.UserComponent.UcCheckBox(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
             this.splitContainer5.Panel1.SuspendLayout();
             this.splitContainer5.Panel2.SuspendLayout();
@@ -109,6 +110,7 @@ namespace TemuKJD.WXForms.AdminForms
             // splitContainer5.Panel1
             // 
             this.splitContainer5.Panel1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.splitContainer5.Panel1.Controls.Add(this.chkHot);
             this.splitContainer5.Panel1.Controls.Add(this.chkShopOptimize);
             this.splitContainer5.Panel1.Controls.Add(this.chkChanceProdCollect);
             this.splitContainer5.Panel1.Controls.Add(this.chkShopPoints);
@@ -157,7 +159,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // chkShopOptimize
             // 
-            this.chkShopOptimize.Location = new System.Drawing.Point(112, 422);
+            this.chkShopOptimize.Location = new System.Drawing.Point(112, 408);
             this.chkShopOptimize.Name = "chkShopOptimize";
             this.chkShopOptimize.Size = new System.Drawing.Size(68, 21);
             this.chkShopOptimize.TabIndex = 813;
@@ -166,7 +168,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // chkChanceProdCollect
             // 
-            this.chkChanceProdCollect.Location = new System.Drawing.Point(192, 422);
+            this.chkChanceProdCollect.Location = new System.Drawing.Point(112, 429);
             this.chkChanceProdCollect.Name = "chkChanceProdCollect";
             this.chkChanceProdCollect.Size = new System.Drawing.Size(96, 21);
             this.chkChanceProdCollect.TabIndex = 812;
@@ -185,7 +187,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // chkWXShowProdGetFromType
             // 
-            this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(192, 395);
+            this.chkWXShowProdGetFromType.Location = new System.Drawing.Point(192, 387);
             this.chkWXShowProdGetFromType.Name = "chkWXShowProdGetFromType";
             this.chkWXShowProdGetFromType.Size = new System.Drawing.Size(68, 21);
             this.chkWXShowProdGetFromType.TabIndex = 810;
@@ -196,7 +198,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(55, 395);
+            this.label7.Location = new System.Drawing.Point(55, 387);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(51, 20);
             this.label7.TabIndex = 809;
@@ -204,7 +206,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // chkWXComplateProd
             // 
-            this.chkWXComplateProd.Location = new System.Drawing.Point(112, 395);
+            this.chkWXComplateProd.Location = new System.Drawing.Point(112, 387);
             this.chkWXComplateProd.Name = "chkWXComplateProd";
             this.chkWXComplateProd.Size = new System.Drawing.Size(68, 21);
             this.chkWXComplateProd.TabIndex = 808;
@@ -218,7 +220,7 @@ namespace TemuKJD.WXForms.AdminForms
             "普通用户",
             "一级超管",
             "二级超管"});
-            this.cmbSaLevel.Location = new System.Drawing.Point(112, 356);
+            this.cmbSaLevel.Location = new System.Drawing.Point(112, 348);
             this.cmbSaLevel.Name = "cmbSaLevel";
             this.cmbSaLevel.Size = new System.Drawing.Size(148, 25);
             this.cmbSaLevel.TabIndex = 48;
@@ -228,7 +230,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(27, 358);
+            this.label6.Location = new System.Drawing.Point(27, 350);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(79, 20);
             this.label6.TabIndex = 47;
@@ -292,7 +294,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(55, 320);
+            this.label3.Location = new System.Drawing.Point(55, 312);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(51, 20);
             this.label3.TabIndex = 40;
@@ -300,7 +302,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // txtCompany
             // 
-            this.txtCompany.Location = new System.Drawing.Point(112, 319);
+            this.txtCompany.Location = new System.Drawing.Point(112, 311);
             this.txtCompany.Name = "txtCompany";
             this.txtCompany.Size = new System.Drawing.Size(148, 23);
             this.txtCompany.TabIndex = 39;
@@ -310,7 +312,7 @@ namespace TemuKJD.WXForms.AdminForms
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.SystemColors.ButtonShadow;
-            this.label2.Location = new System.Drawing.Point(117, 98);
+            this.label2.Location = new System.Drawing.Point(117, 90);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(135, 20);
             this.label2.TabIndex = 38;
@@ -377,7 +379,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label30.AutoSize = true;
             this.label30.ForeColor = System.Drawing.SystemColors.ButtonShadow;
-            this.label30.Location = new System.Drawing.Point(282, 172);
+            this.label30.Location = new System.Drawing.Point(282, 164);
             this.label30.Name = "label30";
             this.label30.Size = new System.Drawing.Size(56, 17);
             this.label30.TabIndex = 33;
@@ -387,7 +389,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label31.AutoSize = true;
             this.label31.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label31.Location = new System.Drawing.Point(266, 246);
+            this.label31.Location = new System.Drawing.Point(266, 238);
             this.label31.Name = "label31";
             this.label31.Size = new System.Drawing.Size(13, 17);
             this.label31.TabIndex = 32;
@@ -395,7 +397,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // txtRePass
             // 
-            this.txtRePass.Location = new System.Drawing.Point(112, 243);
+            this.txtRePass.Location = new System.Drawing.Point(112, 235);
             this.txtRePass.Name = "txtRePass";
             this.txtRePass.PasswordChar = '*';
             this.txtRePass.Size = new System.Drawing.Size(148, 23);
@@ -405,7 +407,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label32.AutoSize = true;
             this.label32.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label32.Location = new System.Drawing.Point(27, 244);
+            this.label32.Location = new System.Drawing.Point(27, 236);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(79, 20);
             this.label32.TabIndex = 31;
@@ -415,7 +417,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label33.AutoSize = true;
             this.label33.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label33.Location = new System.Drawing.Point(266, 284);
+            this.label33.Location = new System.Drawing.Point(266, 276);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(13, 17);
             this.label33.TabIndex = 30;
@@ -425,7 +427,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label34.AutoSize = true;
             this.label34.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label34.Location = new System.Drawing.Point(266, 209);
+            this.label34.Location = new System.Drawing.Point(266, 201);
             this.label34.Name = "label34";
             this.label34.Size = new System.Drawing.Size(13, 17);
             this.label34.TabIndex = 29;
@@ -435,7 +437,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label35.AutoSize = true;
             this.label35.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label35.Location = new System.Drawing.Point(266, 172);
+            this.label35.Location = new System.Drawing.Point(266, 164);
             this.label35.Name = "label35";
             this.label35.Size = new System.Drawing.Size(13, 17);
             this.label35.TabIndex = 28;
@@ -445,7 +447,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label36.AutoSize = true;
             this.label36.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
-            this.label36.Location = new System.Drawing.Point(266, 135);
+            this.label36.Location = new System.Drawing.Point(266, 127);
             this.label36.Name = "label36";
             this.label36.Size = new System.Drawing.Size(13, 17);
             this.label36.TabIndex = 27;
@@ -460,7 +462,7 @@ namespace TemuKJD.WXForms.AdminForms
             "上货",
             "数据",
             "登录"});
-            this.cmbGroup.Location = new System.Drawing.Point(112, 280);
+            this.cmbGroup.Location = new System.Drawing.Point(112, 272);
             this.cmbGroup.Name = "cmbGroup";
             this.cmbGroup.Size = new System.Drawing.Size(148, 25);
             this.cmbGroup.TabIndex = 26;
@@ -470,7 +472,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label37.AutoSize = true;
             this.label37.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label37.Location = new System.Drawing.Point(55, 282);
+            this.label37.Location = new System.Drawing.Point(55, 274);
             this.label37.Name = "label37";
             this.label37.Size = new System.Drawing.Size(51, 20);
             this.label37.TabIndex = 25;
@@ -478,7 +480,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // txtPassword
             // 
-            this.txtPassword.Location = new System.Drawing.Point(112, 206);
+            this.txtPassword.Location = new System.Drawing.Point(112, 198);
             this.txtPassword.Name = "txtPassword";
             this.txtPassword.PasswordChar = '*';
             this.txtPassword.Size = new System.Drawing.Size(148, 23);
@@ -488,7 +490,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label38.AutoSize = true;
             this.label38.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label38.Location = new System.Drawing.Point(55, 207);
+            this.label38.Location = new System.Drawing.Point(55, 199);
             this.label38.Name = "label38";
             this.label38.Size = new System.Drawing.Size(51, 20);
             this.label38.TabIndex = 22;
@@ -496,7 +498,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // txtMobile
             // 
-            this.txtMobile.Location = new System.Drawing.Point(112, 169);
+            this.txtMobile.Location = new System.Drawing.Point(112, 161);
             this.txtMobile.Name = "txtMobile";
             this.txtMobile.Size = new System.Drawing.Size(148, 23);
             this.txtMobile.TabIndex = 21;
@@ -505,7 +507,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label39.AutoSize = true;
             this.label39.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label39.Location = new System.Drawing.Point(41, 170);
+            this.label39.Location = new System.Drawing.Point(41, 162);
             this.label39.Name = "label39";
             this.label39.Size = new System.Drawing.Size(65, 20);
             this.label39.TabIndex = 20;
@@ -513,7 +515,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             // txtNickName
             // 
-            this.txtNickName.Location = new System.Drawing.Point(112, 132);
+            this.txtNickName.Location = new System.Drawing.Point(112, 124);
             this.txtNickName.Name = "txtNickName";
             this.txtNickName.Size = new System.Drawing.Size(148, 23);
             this.txtNickName.TabIndex = 19;
@@ -522,7 +524,7 @@ namespace TemuKJD.WXForms.AdminForms
             // 
             this.label40.AutoSize = true;
             this.label40.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label40.Location = new System.Drawing.Point(55, 133);
+            this.label40.Location = new System.Drawing.Point(55, 125);
             this.label40.Name = "label40";
             this.label40.Size = new System.Drawing.Size(51, 20);
             this.label40.TabIndex = 18;
@@ -722,6 +724,15 @@ namespace TemuKJD.WXForms.AdminForms
             this.btnExportShopErp.Visible = false;
             this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click);
             // 
+            // chkHot
+            // 
+            this.chkHot.Location = new System.Drawing.Point(192, 408);
+            this.chkHot.Name = "chkHot";
+            this.chkHot.Size = new System.Drawing.Size(68, 21);
+            this.chkHot.TabIndex = 814;
+            this.chkHot.Text = "爆款数据";
+            this.chkHot.UseVisualStyleBackColor = true;
+            // 
             // WXAdminAccountForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -804,5 +815,6 @@ namespace TemuKJD.WXForms.AdminForms
         private UserComponent.UcCheckBox chkShopPoints;
         private UserComponent.UcCheckBox chkChanceProdCollect;
         private UserComponent.UcCheckBox chkShopOptimize;
+        private UserComponent.UcCheckBox chkHot;
     }
 }

TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs

@@ -83,6 +83,8 @@ namespace TemuKJD.WXForms.AdminForms
                 authority += "货源选择,";
             if (chkChanceProdCollect.Checked)
                 authority += "机会商品采集,";
+            if (chkHot.Checked)
+                authority += "爆款数据,";
             if (chkShopOptimize.Checked)
                 authority += "评分考核,";
             if (chkShopPoints.Checked)
@@ -197,6 +199,7 @@ namespace TemuKJD.WXForms.AdminForms
             chkWXShowProdGetFromType.Checked = false;
             chkChanceProdCollect.Checked = false;
             chkShopOptimize.Checked = false;
+            chkHot.Checked = false;
             chkShopPoints.Checked = false;
         }
 
@@ -233,6 +236,7 @@ namespace TemuKJD.WXForms.AdminForms
                 chkShopPoints.Checked = authority.Contains(chkShopPoints.Text);
                 chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text);
                 chkShopOptimize.Checked = authority.Contains(chkShopOptimize.Text);
+                chkHot.Checked = authority.Contains(chkHot.Text);
                 chkWXShowProdGetFromType.Checked = authority.Contains(chkWXShowProdGetFromType.Text);
             }
             if (columname == "删除")

TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs

@@ -37,9 +37,10 @@
             System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("1688厂家采集");
             System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("随机厂商商品");
             System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("地址管理");
-            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("图片工具");
-            System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("运单管理");
-            System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("带货助手");
+            System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图片工具");
+            System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("运单管理");
+            System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
@@ -50,7 +51,8 @@
             treeNode8,
             treeNode9,
             treeNode10,
-            treeNode11});
+            treeNode11,
+            treeNode12});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -159,14 +161,16 @@
             treeNode8.Text = "随机厂商商品";
             treeNode9.Name = "地址管理";
             treeNode9.Text = "地址管理";
-            treeNode10.Name = "图片工具";
-            treeNode10.Text = "图片工具";
-            treeNode11.Name = "运单管理";
-            treeNode11.Text = "运单管理";
-            treeNode12.Name = "超级权限管理";
-            treeNode12.Text = "超级权限管理";
+            treeNode10.Name = "带货助手";
+            treeNode10.Text = "带货助手";
+            treeNode11.Name = "图片工具";
+            treeNode11.Text = "图片工具";
+            treeNode12.Name = "运单管理";
+            treeNode12.Text = "运单管理";
+            treeNode13.Name = "超级权限管理";
+            treeNode13.Text = "超级权限管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode12});
+            treeNode13});
             this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
             this.tv.Size = new System.Drawing.Size(140, 446);
             this.tv.TabIndex = 1;

TEMUKJD/WXForms/AdminForms/WXAdminForm.cs

@@ -26,6 +26,7 @@ namespace TemuKJD.WXForms.AdminForms
         public Lazy<Get1688ProductForm> get1688ProdForm = new Lazy<Get1688ProductForm>();
         public Lazy<ImgToolForm> imgToolForm = new Lazy<ImgToolForm>();
         public Lazy<GetAddressForm> getAddressForm = new Lazy<GetAddressForm>();
+        public Lazy<WXSaleAssistantForm> saleAssistantForm = new Lazy<WXSaleAssistantForm>();
         public Lazy<RandomComProductForm> randomComProductForm = new Lazy<RandomComProductForm>();
         public Lazy<WXWaybillManageForm> waybillManageForm = new Lazy<WXWaybillManageForm>();
         public Lazy<JstBanPlatformForm> banPlatformForm = new Lazy<JstBanPlatformForm>();
@@ -105,6 +106,9 @@ namespace TemuKJD.WXForms.AdminForms
                 case "地址管理":
                     SetForm(getAddressForm.Value);
                     break;
+                case "带货助手":
+                    SetForm(saleAssistantForm.Value);
+                    break;
                 case "图片工具":
                     SetForm(imgToolForm.Value);
                     break;

TEMUKJD/WXForms/AdminForms/WXAdminShopListForm.Designer.cs

@@ -63,7 +63,7 @@ namespace TemuKJD.WXForms.AdminForms
             this.pnlAddProdRemaining = new System.Windows.Forms.Panel();
             this.lblShopId = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.pnlCancel = new DevComponents.DotNetBar.PanelEx();
+            this.btnCancel = new DevComponents.DotNetBar.PanelEx();
             this.numAddRemaining = new System.Windows.Forms.NumericUpDown();
             this.btnRemainOK = new DevComponents.DotNetBar.PanelEx();
             this.lblAddProdRemaining = new System.Windows.Forms.Label();
@@ -530,7 +530,7 @@ namespace TemuKJD.WXForms.AdminForms
             // panel2
             // 
             this.panel2.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.panel2.Controls.Add(this.pnlCancel);
+            this.panel2.Controls.Add(this.btnCancel);
             this.panel2.Controls.Add(this.numAddRemaining);
             this.panel2.Controls.Add(this.btnRemainOK);
             this.panel2.Location = new System.Drawing.Point(23, 80);
@@ -538,29 +538,29 @@ namespace TemuKJD.WXForms.AdminForms
             this.panel2.Size = new System.Drawing.Size(424, 29);
             this.panel2.TabIndex = 454;
             // 
-            // pnlCancel
+            // btnCancel
             // 
-            this.pnlCancel.CanvasColor = System.Drawing.SystemColors.Control;
-            this.pnlCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.pnlCancel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlCancel.Location = new System.Drawing.Point(273, 2);
-            this.pnlCancel.Name = "pnlCancel";
-            this.pnlCancel.Size = new System.Drawing.Size(56, 24);
-            this.pnlCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.pnlCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pnlCancel.Style.GradientAngle = 90;
-            this.pnlCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.pnlCancel.TabIndex = 458;
-            this.pnlCancel.Text = "取消";
-            this.pnlCancel.Click += new System.EventHandler(this.pnlCancel_Click);
+            this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnCancel.Location = new System.Drawing.Point(273, 2);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(56, 24);
+            this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnCancel.Style.GradientAngle = 90;
+            this.btnCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnCancel.TabIndex = 458;
+            this.btnCancel.Text = "取消";
+            this.btnCancel.Click += new System.EventHandler(this.pnlCancel_Click);
             // 
             // numAddRemaining
             // 
@@ -1045,7 +1045,7 @@ namespace TemuKJD.WXForms.AdminForms
         private System.Windows.Forms.NumericUpDown numAddRemaining;
         private System.Windows.Forms.Panel panel2;
         private DevComponents.DotNetBar.PanelEx btnRemainOK;
-        private DevComponents.DotNetBar.PanelEx pnlCancel;
+        private DevComponents.DotNetBar.PanelEx btnCancel;
         private System.Windows.Forms.Label lblShopId;
         private DevComponents.DotNetBar.PanelEx btnExportShopErp;
         private DevComponents.DotNetBar.PanelEx btnSearch;

TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.Designer.cs

@@ -0,0 +1,925 @@
+
+namespace TemuKJD.ToolForms
+{
+    partial class WXSaleAssistantForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.btnNext = new System.Windows.Forms.Button();
+            this.btnPrev = new System.Windows.Forms.Button();
+            this.txtAddress = new System.Windows.Forms.TextBox();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.pbLoading = new System.Windows.Forms.PictureBox();
+            this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx();
+            this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colCoId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colImg = new System.Windows.Forms.DataGridViewImageColumn();
+            this.colGoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colHotValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSales30 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colDel = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pnlMultiLogin = new System.Windows.Forms.Panel();
+            this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx();
+            this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx();
+            this.btnDel = new DevComponents.DotNetBar.PanelEx();
+            this.btnClear = new DevComponents.DotNetBar.PanelEx();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtFilterTotalSaleCount = new System.Windows.Forms.TextBox();
+            this.btnGetWxProd = new DevComponents.DotNetBar.PanelEx();
+            this.chkSkipIsAddWindow = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnExportCookie = new DevComponents.DotNetBar.PanelEx();
+            this.label7 = new System.Windows.Forms.Label();
+            this.txtWaitSeconds = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.txtTitle = new System.Windows.Forms.TextBox();
+            this.btnSearchTitle = new DevComponents.DotNetBar.PanelEx();
+            this.btnStopStop = new DevComponents.DotNetBar.PanelEx();
+            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.label4 = new System.Windows.Forms.Label();
+            this.txtPageEnd = new System.Windows.Forms.TextBox();
+            this.txtPageStart = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txtFilterMonthSaleCount = new System.Windows.Forms.TextBox();
+            this.btnRefreshCookie = new DevComponents.DotNetBar.PanelEx();
+            this.txtCookie = new System.Windows.Forms.TextBox();
+            this.btnSaveCookie = new DevComponents.DotNetBar.PanelEx();
+            this.btnImportCookie = new DevComponents.DotNetBar.PanelEx();
+            this.line1 = new DevComponents.DotNetBar.Controls.Line();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.ucTabControlMetro1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
+            this.pnlMultiLogin.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.ucTabControlMetro1);
+            this.splitContainer1.Panel1.Controls.Add(this.pnlMultiLogin);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White;
+            this.splitContainer1.Panel2.Controls.Add(this.btnClear);
+            this.splitContainer1.Panel2.Controls.Add(this.label2);
+            this.splitContainer1.Panel2.Controls.Add(this.txtFilterTotalSaleCount);
+            this.splitContainer1.Panel2.Controls.Add(this.btnGetWxProd);
+            this.splitContainer1.Panel2.Controls.Add(this.chkSkipIsAddWindow);
+            this.splitContainer1.Panel2.Controls.Add(this.label1);
+            this.splitContainer1.Panel2.Controls.Add(this.btnExportCookie);
+            this.splitContainer1.Panel2.Controls.Add(this.label7);
+            this.splitContainer1.Panel2.Controls.Add(this.txtWaitSeconds);
+            this.splitContainer1.Panel2.Controls.Add(this.label8);
+            this.splitContainer1.Panel2.Controls.Add(this.txtTitle);
+            this.splitContainer1.Panel2.Controls.Add(this.btnSearchTitle);
+            this.splitContainer1.Panel2.Controls.Add(this.btnStopStop);
+            this.splitContainer1.Panel2.Controls.Add(this.statusBar);
+            this.splitContainer1.Panel2.Controls.Add(this.label4);
+            this.splitContainer1.Panel2.Controls.Add(this.txtPageEnd);
+            this.splitContainer1.Panel2.Controls.Add(this.txtPageStart);
+            this.splitContainer1.Panel2.Controls.Add(this.label3);
+            this.splitContainer1.Panel2.Controls.Add(this.txtFilterMonthSaleCount);
+            this.splitContainer1.Panel2.Controls.Add(this.btnRefreshCookie);
+            this.splitContainer1.Panel2.Controls.Add(this.txtCookie);
+            this.splitContainer1.Panel2.Controls.Add(this.btnSaveCookie);
+            this.splitContainer1.Panel2.Controls.Add(this.btnImportCookie);
+            this.splitContainer1.Panel2.Controls.Add(this.line1);
+            this.splitContainer1.Size = new System.Drawing.Size(1404, 478);
+            this.splitContainer1.SplitterDistance = 389;
+            this.splitContainer1.TabIndex = 4;
+            // 
+            // ucTabControlMetro1
+            // 
+            this.ucTabControlMetro1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251)))));
+            this.ucTabControlMetro1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(174)))), ((int)(((byte)(157)))));
+            this.ucTabControlMetro1.Controls.Add(this.tabPage1);
+            this.ucTabControlMetro1.Controls.Add(this.tabPage2);
+            this.ucTabControlMetro1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24);
+            this.ucTabControlMetro1.Location = new System.Drawing.Point(0, 0);
+            this.ucTabControlMetro1.Name = "ucTabControlMetro1";
+            this.ucTabControlMetro1.SelectedIndex = 0;
+            this.ucTabControlMetro1.ShowCloseButton = false;
+            this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 389);
+            this.ucTabControlMetro1.TabIndex = 462;
+            this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray;
+            this.ucTabControlMetro1.TabUnSelectTextColor = System.Drawing.Color.White;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.splitContainer2);
+            this.tabPage1.Location = new System.Drawing.Point(4, 28);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(1396, 357);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "商品页面";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.BackColor = System.Drawing.Color.White;
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(3, 3);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.btnNext);
+            this.splitContainer2.Panel1.Controls.Add(this.btnPrev);
+            this.splitContainer2.Panel1.Controls.Add(this.txtAddress);
+            this.splitContainer2.Size = new System.Drawing.Size(1390, 351);
+            this.splitContainer2.SplitterDistance = 26;
+            this.splitContainer2.TabIndex = 6;
+            // 
+            // btnNext
+            // 
+            this.btnNext.Location = new System.Drawing.Point(31, 3);
+            this.btnNext.Name = "btnNext";
+            this.btnNext.Size = new System.Drawing.Size(32, 23);
+            this.btnNext.TabIndex = 9;
+            this.btnNext.Text = "→";
+            this.btnNext.UseVisualStyleBackColor = true;
+            this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
+            // 
+            // btnPrev
+            // 
+            this.btnPrev.Location = new System.Drawing.Point(-1, 3);
+            this.btnPrev.Name = "btnPrev";
+            this.btnPrev.Size = new System.Drawing.Size(32, 23);
+            this.btnPrev.TabIndex = 8;
+            this.btnPrev.Text = "←";
+            this.btnPrev.UseVisualStyleBackColor = true;
+            this.btnPrev.Click += new System.EventHandler(this.btnPrev_Click);
+            // 
+            // txtAddress
+            // 
+            this.txtAddress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtAddress.Location = new System.Drawing.Point(64, 3);
+            this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtAddress.Name = "txtAddress";
+            this.txtAddress.Size = new System.Drawing.Size(1326, 23);
+            this.txtAddress.TabIndex = 7;
+            this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.pbLoading);
+            this.tabPage2.Controls.Add(this.dgvProduct);
+            this.tabPage2.Location = new System.Drawing.Point(4, 28);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(1396, 357);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "采集列表";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // pbLoading
+            // 
+            this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
+            this.pbLoading.Location = new System.Drawing.Point(673, 152);
+            this.pbLoading.Name = "pbLoading";
+            this.pbLoading.Size = new System.Drawing.Size(50, 50);
+            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbLoading.TabIndex = 8;
+            this.pbLoading.TabStop = false;
+            this.pbLoading.Visible = false;
+            // 
+            // dgvProduct
+            // 
+            this.dgvProduct.AllowUserToAddRows = false;
+            this.dgvProduct.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvProduct.AutoRowNumber = true;
+            this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
+            this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colCheck,
+            this.colCoId,
+            this.colSupplierName,
+            this.colProductId,
+            this.colImgUrl,
+            this.colImg,
+            this.colGoodsName,
+            this.colHotValue,
+            this.colSales30,
+            this.colCate,
+            this.colPrice,
+            this.colDel,
+            this.colMsg});
+            this.dgvProduct.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvProduct.Location = new System.Drawing.Point(3, 3);
+            this.dgvProduct.MultiSelectCheckBox = true;
+            this.dgvProduct.Name = "dgvProduct";
+            this.dgvProduct.ReadOnly = true;
+            this.dgvProduct.RowTemplate.Height = 23;
+            this.dgvProduct.Size = new System.Drawing.Size(1390, 351);
+            this.dgvProduct.TabIndex = 7;
+            this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick);
+            // 
+            // colCheck
+            // 
+            this.colCheck.FillWeight = 26F;
+            this.colCheck.HeaderText = "选";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colCoId
+            // 
+            this.colCoId.FillWeight = 50F;
+            this.colCoId.HeaderText = "供应商Id";
+            this.colCoId.Name = "colCoId";
+            this.colCoId.ReadOnly = true;
+            // 
+            // colSupplierName
+            // 
+            this.colSupplierName.FillWeight = 90F;
+            this.colSupplierName.HeaderText = "供应商名称";
+            this.colSupplierName.Name = "colSupplierName";
+            this.colSupplierName.ReadOnly = true;
+            // 
+            // colProductId
+            // 
+            this.colProductId.FillWeight = 50F;
+            this.colProductId.HeaderText = "商品Id";
+            this.colProductId.Name = "colProductId";
+            this.colProductId.ReadOnly = true;
+            // 
+            // colImgUrl
+            // 
+            this.colImgUrl.FillWeight = 300F;
+            this.colImgUrl.HeaderText = "图片路径";
+            this.colImgUrl.Name = "colImgUrl";
+            this.colImgUrl.ReadOnly = true;
+            this.colImgUrl.Visible = false;
+            // 
+            // colImg
+            // 
+            this.colImg.FillWeight = 40F;
+            this.colImg.HeaderText = "图片";
+            this.colImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+            this.colImg.Name = "colImg";
+            this.colImg.ReadOnly = true;
+            this.colImg.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colGoodsName
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colGoodsName.HeaderText = "商品名称";
+            this.colGoodsName.Name = "colGoodsName";
+            this.colGoodsName.ReadOnly = true;
+            // 
+            // colHotValue
+            // 
+            this.colHotValue.FillWeight = 50F;
+            this.colHotValue.HeaderText = "月销量";
+            this.colHotValue.Name = "colHotValue";
+            this.colHotValue.ReadOnly = true;
+            // 
+            // colSales30
+            // 
+            this.colSales30.FillWeight = 50F;
+            this.colSales30.HeaderText = "总销量";
+            this.colSales30.Name = "colSales30";
+            this.colSales30.ReadOnly = true;
+            // 
+            // colCate
+            // 
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCate.DefaultCellStyle = dataGridViewCellStyle4;
+            this.colCate.FillWeight = 80F;
+            this.colCate.HeaderText = "类目";
+            this.colCate.Name = "colCate";
+            this.colCate.ReadOnly = true;
+            this.colCate.Visible = false;
+            // 
+            // colPrice
+            // 
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colPrice.DefaultCellStyle = dataGridViewCellStyle5;
+            this.colPrice.FillWeight = 70F;
+            this.colPrice.HeaderText = "价格";
+            this.colPrice.Name = "colPrice";
+            this.colPrice.ReadOnly = true;
+            // 
+            // colDel
+            // 
+            this.colDel.FillWeight = 35F;
+            this.colDel.HeaderText = "删除";
+            this.colDel.Name = "colDel";
+            this.colDel.ReadOnly = true;
+            // 
+            // colMsg
+            // 
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colMsg.DefaultCellStyle = dataGridViewCellStyle6;
+            this.colMsg.FillWeight = 190F;
+            this.colMsg.HeaderText = "操作结果";
+            this.colMsg.Name = "colMsg";
+            this.colMsg.ReadOnly = true;
+            // 
+            // pnlMultiLogin
+            // 
+            this.pnlMultiLogin.Controls.Add(this.cmbMultiCookieName);
+            this.pnlMultiLogin.Controls.Add(this.btnMultiLogin);
+            this.pnlMultiLogin.Controls.Add(this.btnDel);
+            this.pnlMultiLogin.Location = new System.Drawing.Point(5, 634);
+            this.pnlMultiLogin.Name = "pnlMultiLogin";
+            this.pnlMultiLogin.Size = new System.Drawing.Size(251, 31);
+            this.pnlMultiLogin.TabIndex = 461;
+            this.pnlMultiLogin.Visible = false;
+            // 
+            // cmbMultiCookieName
+            // 
+            this.cmbMultiCookieName.DisplayMember = "Text";
+            this.cmbMultiCookieName.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
+            this.cmbMultiCookieName.FormattingEnabled = true;
+            this.cmbMultiCookieName.ItemHeight = 18;
+            this.cmbMultiCookieName.Location = new System.Drawing.Point(3, 3);
+            this.cmbMultiCookieName.Name = "cmbMultiCookieName";
+            this.cmbMultiCookieName.Size = new System.Drawing.Size(158, 24);
+            this.cmbMultiCookieName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.cmbMultiCookieName.TabIndex = 379;
+            this.cmbMultiCookieName.Text = "cookie1";
+            // 
+            // btnMultiLogin
+            // 
+            this.btnMultiLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnMultiLogin.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnMultiLogin.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnMultiLogin.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnMultiLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnMultiLogin.Location = new System.Drawing.Point(185, 3);
+            this.btnMultiLogin.Name = "btnMultiLogin";
+            this.btnMultiLogin.Size = new System.Drawing.Size(60, 24);
+            this.btnMultiLogin.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnMultiLogin.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnMultiLogin.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnMultiLogin.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnMultiLogin.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnMultiLogin.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnMultiLogin.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnMultiLogin.Style.GradientAngle = 90;
+            this.btnMultiLogin.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnMultiLogin.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnMultiLogin.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnMultiLogin.TabIndex = 460;
+            this.btnMultiLogin.Text = "多重登录";
+            // 
+            // btnDel
+            // 
+            this.btnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnDel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnDel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnDel.Location = new System.Drawing.Point(163, 3);
+            this.btnDel.Name = "btnDel";
+            this.btnDel.Size = new System.Drawing.Size(20, 24);
+            this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnDel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnDel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnDel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnDel.Style.GradientAngle = 90;
+            this.btnDel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnDel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnDel.TabIndex = 409;
+            this.btnDel.Text = "删";
+            // 
+            // btnClear
+            // 
+            this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnClear.Location = new System.Drawing.Point(1163, 57);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(76, 23);
+            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnClear.Style.GradientAngle = 90;
+            this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.TabIndex = 1171;
+            this.btnClear.Text = "清除选中";
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(643, 8);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(53, 17);
+            this.label2.TabIndex = 1146;
+            this.label2.Text = "总销量≥";
+            // 
+            // txtFilterTotalSaleCount
+            // 
+            this.txtFilterTotalSaleCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtFilterTotalSaleCount.Location = new System.Drawing.Point(702, 5);
+            this.txtFilterTotalSaleCount.Name = "txtFilterTotalSaleCount";
+            this.txtFilterTotalSaleCount.Size = new System.Drawing.Size(59, 23);
+            this.txtFilterTotalSaleCount.TabIndex = 1145;
+            this.txtFilterTotalSaleCount.Text = "500";
+            this.txtFilterTotalSaleCount.TextChanged += new System.EventHandler(this.txtFilterTotalSaleCount_TextChanged);
+            // 
+            // btnGetWxProd
+            // 
+            this.btnGetWxProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnGetWxProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnGetWxProd.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnGetWxProd.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnGetWxProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnGetWxProd.Location = new System.Drawing.Point(1321, 57);
+            this.btnGetWxProd.Name = "btnGetWxProd";
+            this.btnGetWxProd.Size = new System.Drawing.Size(76, 23);
+            this.btnGetWxProd.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnGetWxProd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnGetWxProd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnGetWxProd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnGetWxProd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnGetWxProd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnGetWxProd.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnGetWxProd.Style.GradientAngle = 90;
+            this.btnGetWxProd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnGetWxProd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnGetWxProd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnGetWxProd.TabIndex = 1123;
+            this.btnGetWxProd.Text = "翻页采集";
+            this.btnGetWxProd.Click += new System.EventHandler(this.btnGetWxProd_Click);
+            // 
+            // chkSkipIsAddWindow
+            // 
+            this.chkSkipIsAddWindow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkSkipIsAddWindow.AutoSize = true;
+            this.chkSkipIsAddWindow.Checked = true;
+            this.chkSkipIsAddWindow.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.chkSkipIsAddWindow.Location = new System.Drawing.Point(775, 6);
+            this.chkSkipIsAddWindow.Name = "chkSkipIsAddWindow";
+            this.chkSkipIsAddWindow.Size = new System.Drawing.Size(99, 21);
+            this.chkSkipIsAddWindow.TabIndex = 1098;
+            this.chkSkipIsAddWindow.Text = "跳过已加橱窗";
+            this.chkSkipIsAddWindow.UseVisualStyleBackColor = true;
+            // 
+            // label1
+            // 
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(519, 8);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(53, 17);
+            this.label1.TabIndex = 1097;
+            this.label1.Text = "月销量≥";
+            // 
+            // btnExportCookie
+            // 
+            this.btnExportCookie.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnExportCookie.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnExportCookie.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnExportCookie.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnExportCookie.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnExportCookie.Location = new System.Drawing.Point(227, 57);
+            this.btnExportCookie.Name = "btnExportCookie";
+            this.btnExportCookie.Size = new System.Drawing.Size(72, 25);
+            this.btnExportCookie.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnExportCookie.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnExportCookie.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnExportCookie.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnExportCookie.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnExportCookie.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnExportCookie.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnExportCookie.Style.GradientAngle = 90;
+            this.btnExportCookie.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnExportCookie.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnExportCookie.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnExportCookie.TabIndex = 1063;
+            this.btnExportCookie.Text = "导出cookie";
+            this.btnExportCookie.Click += new System.EventHandler(this.btnExportCookie_Click);
+            // 
+            // label7
+            // 
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(1289, 28);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(56, 17);
+            this.label7.TabIndex = 1027;
+            this.label7.Text = "翻页间隔";
+            // 
+            // txtWaitSeconds
+            // 
+            this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtWaitSeconds.Location = new System.Drawing.Point(1345, 25);
+            this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtWaitSeconds.Name = "txtWaitSeconds";
+            this.txtWaitSeconds.Size = new System.Drawing.Size(32, 23);
+            this.txtWaitSeconds.TabIndex = 1028;
+            this.txtWaitSeconds.Text = "0.3";
+            this.txtWaitSeconds.TextChanged += new System.EventHandler(this.txtWaitSeconds_TextChanged);
+            // 
+            // label8
+            // 
+            this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(1377, 28);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(20, 17);
+            this.label8.TabIndex = 1029;
+            this.label8.Text = "秒";
+            // 
+            // txtTitle
+            // 
+            this.txtTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtTitle.Location = new System.Drawing.Point(319, 33);
+            this.txtTitle.Name = "txtTitle";
+            this.txtTitle.Size = new System.Drawing.Size(202, 23);
+            this.txtTitle.TabIndex = 968;
+            this.txtTitle.Visible = false;
+            // 
+            // btnSearchTitle
+            // 
+            this.btnSearchTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSearchTitle.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSearchTitle.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearchTitle.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSearchTitle.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearchTitle.Location = new System.Drawing.Point(523, 33);
+            this.btnSearchTitle.Name = "btnSearchTitle";
+            this.btnSearchTitle.Size = new System.Drawing.Size(56, 23);
+            this.btnSearchTitle.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearchTitle.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearchTitle.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearchTitle.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSearchTitle.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSearchTitle.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSearchTitle.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSearchTitle.Style.GradientAngle = 90;
+            this.btnSearchTitle.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearchTitle.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearchTitle.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearchTitle.TabIndex = 967;
+            this.btnSearchTitle.Text = "搜索标题";
+            this.btnSearchTitle.Visible = false;
+            this.btnSearchTitle.Click += new System.EventHandler(this.btnSearchTitle_Click);
+            // 
+            // btnStopStop
+            // 
+            this.btnStopStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnStopStop.Location = new System.Drawing.Point(1242, 57);
+            this.btnStopStop.Name = "btnStopStop";
+            this.btnStopStop.Size = new System.Drawing.Size(76, 23);
+            this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnStopStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnStopStop.Style.GradientAngle = 90;
+            this.btnStopStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnStopStop.TabIndex = 853;
+            this.btnStopStop.Text = "停止查询";
+            this.btnStopStop.Click += new System.EventHandler(this.btnStopStop_Click);
+            // 
+            // statusBar
+            // 
+            this.statusBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.statusBar.BackColor = System.Drawing.Color.White;
+            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(315, 60);
+            this.statusBar.Margin = new System.Windows.Forms.Padding(0);
+            this.statusBar.Name = "statusBar";
+            this.statusBar.Size = new System.Drawing.Size(689, 25);
+            this.statusBar.TabIndex = 823;
+            // 
+            // label4
+            // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(410, 8);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(44, 17);
+            this.label4.TabIndex = 810;
+            this.label4.Text = "结束页";
+            // 
+            // txtPageEnd
+            // 
+            this.txtPageEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtPageEnd.Location = new System.Drawing.Point(454, 5);
+            this.txtPageEnd.Name = "txtPageEnd";
+            this.txtPageEnd.Size = new System.Drawing.Size(43, 23);
+            this.txtPageEnd.TabIndex = 809;
+            this.txtPageEnd.Text = "99999";
+            this.txtPageEnd.TextChanged += new System.EventHandler(this.txtPageEnd_TextChanged);
+            // 
+            // txtPageStart
+            // 
+            this.txtPageStart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtPageStart.Location = new System.Drawing.Point(361, 5);
+            this.txtPageStart.Name = "txtPageStart";
+            this.txtPageStart.Size = new System.Drawing.Size(43, 23);
+            this.txtPageStart.TabIndex = 808;
+            this.txtPageStart.Text = "1";
+            this.txtPageStart.TextChanged += new System.EventHandler(this.txtPageStart_TextChanged);
+            // 
+            // label3
+            // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(317, 8);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(44, 17);
+            this.label3.TabIndex = 807;
+            this.label3.Text = "起始页";
+            // 
+            // txtFilterMonthSaleCount
+            // 
+            this.txtFilterMonthSaleCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtFilterMonthSaleCount.Location = new System.Drawing.Point(578, 5);
+            this.txtFilterMonthSaleCount.Name = "txtFilterMonthSaleCount";
+            this.txtFilterMonthSaleCount.Size = new System.Drawing.Size(59, 23);
+            this.txtFilterMonthSaleCount.TabIndex = 787;
+            this.txtFilterMonthSaleCount.Text = "100";
+            this.txtFilterMonthSaleCount.TextChanged += new System.EventHandler(this.txtFilterSaleCount_TextChanged);
+            // 
+            // btnRefreshCookie
+            // 
+            this.btnRefreshCookie.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnRefreshCookie.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnRefreshCookie.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnRefreshCookie.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnRefreshCookie.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnRefreshCookie.Location = new System.Drawing.Point(153, 57);
+            this.btnRefreshCookie.Name = "btnRefreshCookie";
+            this.btnRefreshCookie.Size = new System.Drawing.Size(72, 25);
+            this.btnRefreshCookie.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRefreshCookie.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRefreshCookie.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRefreshCookie.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnRefreshCookie.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnRefreshCookie.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnRefreshCookie.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnRefreshCookie.Style.GradientAngle = 90;
+            this.btnRefreshCookie.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRefreshCookie.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRefreshCookie.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRefreshCookie.TabIndex = 776;
+            this.btnRefreshCookie.Text = "刷新cookie";
+            this.btnRefreshCookie.Click += new System.EventHandler(this.btnRefreshCookie_Click);
+            // 
+            // txtCookie
+            // 
+            this.txtCookie.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtCookie.Location = new System.Drawing.Point(4, 4);
+            this.txtCookie.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtCookie.Multiline = true;
+            this.txtCookie.Name = "txtCookie";
+            this.txtCookie.Size = new System.Drawing.Size(145, 78);
+            this.txtCookie.TabIndex = 766;
+            this.txtCookie.Text = "填写cookie后点击导入cookie并刷新";
+            // 
+            // btnSaveCookie
+            // 
+            this.btnSaveCookie.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSaveCookie.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSaveCookie.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSaveCookie.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSaveCookie.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.btnSaveCookie.Location = new System.Drawing.Point(153, 30);
+            this.btnSaveCookie.Name = "btnSaveCookie";
+            this.btnSaveCookie.Size = new System.Drawing.Size(146, 25);
+            this.btnSaveCookie.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSaveCookie.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSaveCookie.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSaveCookie.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSaveCookie.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSaveCookie.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSaveCookie.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSaveCookie.Style.GradientAngle = 90;
+            this.btnSaveCookie.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSaveCookie.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSaveCookie.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSaveCookie.TabIndex = 765;
+            this.btnSaveCookie.Text = "保存网页cookie到服务";
+            this.btnSaveCookie.Click += new System.EventHandler(this.btnSaveCookie_Click);
+            // 
+            // btnImportCookie
+            // 
+            this.btnImportCookie.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnImportCookie.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnImportCookie.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnImportCookie.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnImportCookie.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnImportCookie.Location = new System.Drawing.Point(153, 3);
+            this.btnImportCookie.Name = "btnImportCookie";
+            this.btnImportCookie.Size = new System.Drawing.Size(146, 25);
+            this.btnImportCookie.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnImportCookie.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnImportCookie.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnImportCookie.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnImportCookie.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnImportCookie.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnImportCookie.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnImportCookie.Style.GradientAngle = 90;
+            this.btnImportCookie.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnImportCookie.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnImportCookie.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnImportCookie.TabIndex = 761;
+            this.btnImportCookie.Text = "导入cookie并刷新";
+            this.btnImportCookie.Click += new System.EventHandler(this.btnImportCookie_Click);
+            // 
+            // line1
+            // 
+            this.line1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.line1.ForeColor = System.Drawing.SystemColors.AppWorkspace;
+            this.line1.Location = new System.Drawing.Point(298, 7);
+            this.line1.Name = "line1";
+            this.line1.Size = new System.Drawing.Size(20, 74);
+            this.line1.TabIndex = 790;
+            this.line1.Text = "line1";
+            this.line1.VerticalLine = true;
+            // 
+            // WXSaleAssistantForm
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(1404, 478);
+            this.Controls.Add(this.splitContainer1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.KeyPreview = true;
+            this.Name = "WXSaleAssistantForm";
+            this.Text = "微信带货助手";
+            this.Load += new System.EventHandler(this.GetJuShuitanProdForm_Load);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.Panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.ucTabControlMetro1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit();
+            this.pnlMultiLogin.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Panel pnlMultiLogin;
+        private DevComponents.DotNetBar.Controls.ComboBoxEx cmbMultiCookieName;
+        private DevComponents.DotNetBar.PanelEx btnMultiLogin;
+        private DevComponents.DotNetBar.PanelEx btnDel;
+        private System.Windows.Forms.TextBox txtCookie;
+        private DevComponents.DotNetBar.PanelEx btnSaveCookie;
+        private DevComponents.DotNetBar.PanelEx btnImportCookie;
+        private DevComponents.DotNetBar.PanelEx btnRefreshCookie;
+        private System.Windows.Forms.TextBox txtFilterMonthSaleCount;
+        private DevComponents.DotNetBar.Controls.Line line1;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox txtPageEnd;
+        private System.Windows.Forms.TextBox txtPageStart;
+        private System.Windows.Forms.Label label3;
+        private UserControls.StatusBarUserControl statusBar;
+        private DevComponents.DotNetBar.PanelEx btnStopStop;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox txtWaitSeconds;
+        private System.Windows.Forms.Label label8;
+        private DevComponents.DotNetBar.PanelEx btnExportCookie;
+        private UserControls.UcTabControlMetro ucTabControlMetro1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.Button btnNext;
+        private System.Windows.Forms.Button btnPrev;
+        private System.Windows.Forms.TextBox txtAddress;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.PictureBox pbLoading;
+        private UserComponent.DataGridViewEx dgvProduct;
+        private System.Windows.Forms.TextBox txtTitle;
+        private DevComponents.DotNetBar.PanelEx btnSearchTitle;
+        private System.Windows.Forms.Label label1;
+        private UserComponent.UcCheckBox chkSkipIsAddWindow;
+        private DevComponents.DotNetBar.PanelEx btnGetWxProd;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtFilterTotalSaleCount;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCoId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colProductId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
+        private System.Windows.Forms.DataGridViewImageColumn colImg;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGoodsName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colHotValue;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSales30;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCate;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPrice;
+        private System.Windows.Forms.DataGridViewLinkColumn colDel;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
+        private DevComponents.DotNetBar.PanelEx btnClear;
+    }
+}

TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.cs

@@ -0,0 +1,775 @@
+using AllBase;
+using AllBase.Model.Result;
+using AllBase.Model.Result.PDDResult;
+using CefSharp;
+using CefSharp.WinForms;
+using NaiBa.CefHelper;
+using NaiBa.CefHelper.Handler;
+using NaiBa.Util;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.Extension;
+using TemuKJD.Helper;
+using TemuKJD.PDDForms.ProductSelectForms;
+using TemuKJD.WXForms.ProductForms;
+using Work;
+
+namespace TemuKJD.ToolForms
+{
+    public partial class WXSaleAssistantForm : BaseForms.BaseForm
+    {
+        public bool isGetingProdWithCef = false;
+        public CancellationTokenSource cancellationTokenSource { get; set; } = null;
+        ConcurrentList<WXSaleAssistantSpuItemInfo> lstWxSaleAssistantSpuItemInfo = new ConcurrentList<WXSaleAssistantSpuItemInfo>();
+        string InitUrl = "https://store.weixin.qq.com/talent/pool/home";
+        public ChromiumWebBrowser cefWebBrowser = null;
+        private string currentUrl = "";
+        int pageStart = 1;
+        int pageEnd = 9999;
+        decimal getDetailWaitSeconds = 1;
+        int filterMonthSaleCount = 100;
+        int filterTotalSaleCount = 500;
+        int searchPageCount = 0;
+
+        public WXSaleAssistantForm()
+        {
+            InitializeComponent();
+        }
+
+        private void GetJuShuitanProdForm_Load(object sender, EventArgs e)
+        {
+            //this.ucTabControlMetro1.TabPages.Remove(tabPage3);
+
+            //this.splitContainer1.SplitterDistance = 472;
+            this.dgvProduct.AddSelectorColumn("colCheck");
+            this.dgvProduct.AddImgColumn("colImg", "colImgUrl");
+
+
+            lstWxSaleAssistantSpuItemInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<WXSaleAssistantSpuItemInfo>>("wx_sale_assistant_list_" + MainForm.ProcessCount);
+            if (lstWxSaleAssistantSpuItemInfo == null)
+                lstWxSaleAssistantSpuItemInfo = new ConcurrentList<WXSaleAssistantSpuItemInfo>();
+
+            pbLoading.Visible = true;
+            Task.Run(() =>
+            {
+                int id = 0;
+                foreach (var prod in lstWxSaleAssistantSpuItemInfo)
+                {
+                    id++;
+                    if (id % 50 == 0)
+                        Thread.Sleep(1);
+                    Invoke(new Action(() =>
+                    {
+                        var rowId = this.dgvProduct.Rows.Add(
+                            true,
+                            prod.shop.appId,
+                            prod.shop.name,
+                            prod.spu.id,
+                            prod.spu.headImage, //.Replace("https://", "http://"),
+                            DataGridViewExtension.defaultBitmap,
+                            prod.spu.name,
+                            prod.spu.sales.monthlySales,
+                            prod.spu.sales.cumulativeSales,
+                            "", // 没有类目信息，不填
+                            prod.spu.price.sellingPrice * 0.01m,
+                            "删除",
+                            prod.operateMsg
+                        );
+                        dgvProduct.Rows[rowId].Height = 60;
+                    }));
+                }
+                Invoke(new Action(() =>
+                {
+                    pbLoading.Visible = false;
+                }));
+            });
+
+            InitCef();
+        }
+
+        void InitCef()
+        {
+            if (cefWebBrowser == null)
+            {
+                cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(InitUrl, false);
+
+                CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal();
+                resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
+                resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad;
+                cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler);
+                var lifeSapnHandler = new LifeSpanHandlerLocal(PopWindowType.SelfWindow);
+                cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
+                cefWebBrowser.KeyboardHandler = new KeyboardHandler();
+                cefWebBrowser.FrameLoadEnd += CefWebBrowser_FrameLoadEnd;
+                cefWebBrowser.AddressChanged += CefWebBrowser_AddressChanged;
+                cefWebBrowser.LoadError += CefWebBrowser_LoadError;
+                cefWebBrowser.Dock = DockStyle.Fill;
+
+                Invoke(new Action(() =>
+                {
+                    splitContainer2.Panel2.Controls.Add(cefWebBrowser);
+                    //cefWebBrowser.Load(shopMainUrl);
+                }));
+            }
+
+            Task.Run(() =>
+            {
+                string serverCookie = "";
+                var url = BaseClass.BuildWXObjString("user/get_wx_sale_assistant_cookie");
+                var data = UserLogin.GetSignaturex();
+                var result = GetHtml.PostUtf8(url, data);
+                if (!result.Contains("\"code\":200"))
+                    result = GetHtml.PostUtf8(url, data);
+
+                List<Cookie> cookieLst = new List<Cookie>();
+                try
+                {
+                    serverCookie = JsonHelper.SerializeObject(JsonHelper.JObjectParse(result)["cookie"]);
+                    cookieLst = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(serverCookie);
+                    if (cookieLst == null)
+                        cookieLst = new List<Cookie>();
+                }
+                catch
+                {
+                }
+
+
+                // cef138必须init后方可设置或删除cookie
+                while (!cefWebBrowser.IsBrowserInitialized || !cefWebBrowser.GetBrowser().MainFrame.IsValid)
+                    Thread.Sleep(20);
+                CEFBrowser.DeleteCookie(cefWebBrowser.GetCookieManager(null));
+
+                //cef 138 如果没有设置RequestContext 可能为空，直接getCookieManager
+                //if (this.openType != EnumOpenType.login)
+                {
+                    //var t = CEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), cefWebBrowser.GetCookieManager(null));
+                    foreach (var cook in cookieLst)
+                    {
+                        var t = CEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", cefWebBrowser.GetCookieManager(null));
+                        t.Wait(5000);
+                    }
+                }
+                cefWebBrowser.Load(InitUrl);
+            });
+        }
+
+        private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e)
+        {
+        }
+
+        private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
+        {
+            var dataTmp = responseData;
+            var postTmp = postData;
+            if (isGetingProdWithCef && spuItemsBase == null && url.Contains("https://store.weixin.qq.com/shop-faas/mmeckolpoolnode/ecListSelectionSpuItems?token=&lang=zh_CN"))
+            {
+                getSpuItemsParams = JsonHelper.JObjectParse(postTmp);
+                Task.Run(() =>
+                {
+                    showGetSaleAssistantItems(dataTmp);
+                });
+            }
+        }
+
+        public string requestId = "";
+        public string pageContext = "";
+        List<WXSaleAssistantSpuItemInfo> spuItemsBase = null;
+        JObject getSpuItemsParams = null;
+        void showGetSaleAssistantItems(string spuItemsData)
+        {
+            try
+            {
+                searchPageCount++;
+                Invoke(new Action(() =>
+                {
+                    statusBar.lblTaskStatus.Text = "当前翻页数：" + searchPageCount;
+                }));
+                if (searchPageCount % 10 == 0)
+                {
+                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_sale_assistant_list_" + MainForm.ProcessCount, lstWxSaleAssistantSpuItemInfo);
+                }
+                if (searchPageCount >= pageEnd)
+                {
+                    isGetingProdWithCef = false;
+                }
+                if (spuItemsData.Contains("\"hasNext\":false"))
+                {
+                    isGetingProdWithCef = false;
+                }
+                pageContext = BaseRegex.GetStringJson(ref spuItemsData, "pageContext");
+                requestId = BaseRegex.GetStringJson(ref spuItemsData, "requestId");
+
+                var jObj = JsonHelper.JObjectParse(spuItemsData)["spuItems"];
+                var spuItems = JsonHelper.DeserializeJsonToList<WXSaleAssistantSpuItemInfo>(JsonHelper.SerializeObject(jObj));
+                if (spuItemsBase == null)
+                {
+                    spuItemsBase = spuItems;
+                    foreach (var spuItem in spuItems)
+                    {
+                        // 月销
+                        if (spuItem.spu.sales.monthlySales < filterMonthSaleCount)
+                            continue;
+                        // 总销
+                        if (spuItem.spu.sales.cumulativeSales < filterTotalSaleCount)
+                            continue;
+                        // 已加入橱窗
+                        if (chkSkipIsAddWindow.Checked && spuItem.shopWindow != null && spuItem.shopWindow.status == 1)
+                            continue;
+                        // 已存在
+                        if (lstWxSaleAssistantSpuItemInfo.Any(s => s.spu.id == spuItem.spu.id))
+                            continue;
+
+                        lstWxSaleAssistantSpuItemInfo.Add(spuItem);
+                        Invoke(new Action(() =>
+                        {
+                            var rowId = this.dgvProduct.Rows.Add(
+                                true,
+                                spuItem.shop.appId,
+                                spuItem.shop.name,
+                                spuItem.spu.id,
+                                spuItem.spu.headImage, //.Replace("https://", "http://"),
+                                DataGridViewExtension.defaultBitmap,
+                                spuItem.spu.name,
+                                spuItem.spu.sales.monthlySales,
+                                spuItem.spu.sales.cumulativeSales,
+                                "", // 没有类目信息，不填
+                                spuItem.spu.price.sellingPrice * 0.01m,
+                                "删除",
+                                spuItem.operateMsg
+                            );
+                            dgvProduct.Rows[rowId].Height = 60;
+                        }));
+                    }
+                }
+            }
+            catch
+            { 
+            }
+            //currentGetHotListParamData = "";
+            //currentGetSupplierListParamData = postData;
+            //currentSupplierId = BaseRegex.GetStringJson(ref postData, "supplierId");
+            //currentSupplierName = BaseRegex.GetStringJson(ref responseData, "supplierName");
+        }
+
+        private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request)
+        {
+            return false;
+        }
+
+        private void CefWebBrowser_AddressChanged(object sender, CefSharp.AddressChangedEventArgs e)
+        {
+            if (this.Created && !this.Disposing && !this.IsDisposed)
+            {
+                Task.Run(() =>
+                {
+                    Invoke(new Action(() =>
+                    {
+                        currentUrl = e.Address;
+                        txtAddress.Text = e.Address;
+                    }));
+                });
+            }
+        }
+
+        private void CefWebBrowser_LoadError(object sender, CefSharp.LoadErrorEventArgs e)
+        {
+        }
+
+        private void btnImportCookie_Click(object sender, EventArgs e)
+        {
+            Task.Run(() =>
+            {
+                foreach (var cookie in txtCookie.Text.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))
+                {
+                    var t = CEFBrowser.SetCookieAsync("store.weixin.qq.com", cookie, cefWebBrowser.GetCookieManager(null));
+                    t.Wait(5000);
+                }
+                cefWebBrowser.Load(InitUrl);
+            });
+        }
+
+        private void btnSaveCookie_Click(object sender, EventArgs e)
+        {
+            List<Cookie> cookieList = CEFBrowser.GetCookieList("store.weixin.qq.com", cefWebBrowser.GetCookieManager(null));
+
+            var url = BaseClass.BuildWXObjString("user/update_wx_sale_assistant_cookie");
+            var data = UserLogin.GetSignaturex();
+            data += "&cookie=" + GetHtml.UrlEncodeUtf8(JsonHelper.SerializeObject(cookieList));
+            var result = GetHtml.PostUtf8(url, data);
+            if (!result.Contains("\"code\":200"))
+                result = GetHtml.PostUtf8(url, data);
+
+            if (result.Contains("\"code\":200"))
+                BaseMsgForm.ShowInfo("保存成功");
+            else
+                BaseMsgForm.ShowInfo("保存失败，请重试");
+        }
+
+        private void btnRefreshCookie_Click(object sender, EventArgs e)
+        {
+            InitCef();
+        }
+
+        private void btnPrev_Click(object sender, EventArgs e)
+        {
+            cefWebBrowser.Back();
+        }
+
+        private void btnNext_Click(object sender, EventArgs e)
+        {
+            cefWebBrowser.Forward();
+        }
+
+        private void txtAddress_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (cefWebBrowser != null)
+                {
+                    cefWebBrowser.Load(txtAddress.Text);
+                }
+            }
+        }
+
+        private void dgvProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            string headerText = dgvProduct.Columns[e.ColumnIndex].HeaderText;
+            var prodId = dgvProduct.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString();
+            var prod = lstWxSaleAssistantSpuItemInfo.FirstOrDefault(p => p.spu.id == prodId);
+            var row = dgvProduct.Rows[e.RowIndex];
+
+            switch (headerText)
+            {
+                case "删除":
+                    //if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel)
+                    //    return;
+                    //DeleteProduct(dbId);
+                    dgvProduct.Rows.Remove(row);
+                    lstWxSaleAssistantSpuItemInfo.Remove(prod);
+                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_sale_assistant_list_" + MainForm.ProcessCount, lstWxSaleAssistantSpuItemInfo);
+                    break;
+                case "图片":
+                    var imgUrl = dgvProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "");
+                    Dictionary<string, string> dic = new Dictionary<string, string>();
+                    dic[imgUrl] = imgUrl;
+                    foreach (var imgPath in prod.spu.headImage)
+                    {
+                        //dic[imgPath.Replace("https", "http")] = imgPath.Replace("https", "http");
+                    }
+                    ShowImgForm imgFrom = new ShowImgForm(imgUrl, dic);
+                    imgFrom.ShowDialog();
+                    break;
+                case "":
+                    dgvProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvProduct.Rows[e.RowIndex].Cells["colCheck"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void txtFilterSaleCount_TextChanged(object sender, EventArgs e)
+        {
+            filterMonthSaleCount = txtFilterMonthSaleCount.Text.Trim().ParseToInt();
+        }
+
+        private void txtFilterTotalSaleCount_TextChanged(object sender, EventArgs e)
+        {
+            filterTotalSaleCount = txtFilterTotalSaleCount.Text.Trim().ParseToInt();
+        }
+
+        private void txtPageStart_TextChanged(object sender, EventArgs e)
+        {
+            pageStart = txtPageStart.Text.Trim().ParseToInt();
+        }
+
+        private void txtPageEnd_TextChanged(object sender, EventArgs e)
+        {
+            pageEnd = txtPageEnd.Text.Trim().ParseToInt();
+        }
+
+        private void btnStopStop_Click(object sender, EventArgs e)
+        {
+            if (cancellationTokenSource != null)
+                cancellationTokenSource.Cancel();
+            isGetingProdWithCef = false;
+
+            Task.Run(() =>
+            {
+                Thread.Sleep(5000);
+                Invoke(new Action(() =>
+                {
+                    if (cancellationTokenSource == null || cancellationTokenSource.IsCancellationRequested)
+                        pbLoading.Visible = false;
+                }));
+            });
+        }
+
+
+        private void btnSearchTitle_Click(object sender, EventArgs e)
+        {
+            pbLoading.Visible = true;
+            Task.Run(() =>
+            {
+                foreach (DataGridViewRow row in dgvProduct.Rows)
+                {
+                    Invoke(new Action(() =>
+                    {
+
+                        row.Visible = (row.Cells["colGoodsName"].Value.ParseToString().Contains(txtTitle.Text.Trim()) || txtTitle.Text.Trim() == "");
+                        if (row.Visible == false)
+                            row.Cells["colCheck"].Value = false;
+
+                    }));
+                }
+                Invoke(new Action(() =>
+                {
+                    pbLoading.Visible = false;
+                }));
+            });
+        }
+
+
+        private void txtWaitSeconds_TextChanged(object sender, EventArgs e)
+        {
+            getDetailWaitSeconds = txtWaitSeconds.Text.ParseToDecimal();
+        }
+
+        private void btnExportCookie_Click(object sender, EventArgs e)
+        {
+            List<Cookie> cookieList = CEFBrowser.GetCookieList("store.weixin.qq.com", cefWebBrowser.GetCookieManager(null));
+            var shop = new ShopLoginInfo();
+            shop.Cookies = JsonHelper.SerializeObject(cookieList);
+
+            List<CefSharp.Cookie> cooks = null;
+            try { cooks = JsonHelper.DeserializeJsonToList<CefSharp.Cookie>(shop.Cookies); } catch (Exception ex) { }
+            if (cooks == null)
+                cooks = new List<CefSharp.Cookie>();
+
+            string cookJs = "";
+            var keys = new string[] { "device_id", "talent_magic", "talent_rand", "talent_token" };
+            foreach (var shopCook in cooks)
+            {
+                var cookie = shopCook.Name + "=" + shopCook.Value;
+                if (!keys.Any(k => cookie.StartsWith(k)))
+                    continue;
+                cookJs += "\r\ndocument.cookie='" + cookie.Substring(0, Math.Max(0, cookie.IndexOf("="))) + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';";
+            }
+            foreach (var shopCook in cooks)
+            {
+                var cookie = shopCook.Name + "=" + shopCook.Value;
+                if (!keys.Any(k => cookie.StartsWith(k)))
+                    continue;
+                cookJs += "\r\ndocument.cookie='" + cookie + "; domain=store.weixin.qq.com; expires=" +
+                    DateTime.Now.AddMonths(1).ToUniversalTime().ToString("ddd, dd MMM yyyy HH:mm:ss 'UTC'", new DateTimeFormatInfo()) + "; path=/';";
+            }
+            cookJs += "\r\nsetTimeout(() => { window.location.href='" + InitUrl + "'; }, 200)";
+            Clipboard.SetDataObject(cookJs);
+            BaseMsgForm.ShowInfo("复制成功");
+        }
+
+        private void btnGetWxProd_Click(object sender, EventArgs e)
+        {
+            isGetingProdWithCef = true;
+            pbLoading.Visible = true;
+            if (cancellationTokenSource != null)
+                cancellationTokenSource.Cancel();
+            cancellationTokenSource = new CancellationTokenSource();
+
+            dgvProduct.Rows.Clear();
+            lstWxSaleAssistantSpuItemInfo.Clear();
+            searchPageCount = 0;
+            spuItemsBase = null;
+            getSpuItemsParams = null;
+
+            Task.Run(() =>
+            {
+                int top = 0;
+                while (this.isGetingProdWithCef == true)
+                {
+                    if (cancellationTokenSource.IsCancellationRequested)
+                        break;
+
+                    top += Randomx.GetId(500, 900);
+                    Thread.Sleep((int)(getDetailWaitSeconds * 1000) - 100 + Randomx.GetId(101, 501));
+
+                    if (cefWebBrowser.IsLoading)
+                    {
+
+                    }
+
+                    var jsStr = @"window.scroll({
+                                          top: document.body.scrollHeight,
+                                          left: 0,
+                                          behavior: 'smooth' // 可选，使滚动平滑
+                                        });";
+                    //jsStr = @"window.scroll({
+                    //                      top: " + top + @",
+                    //                      left: 0,
+                    //                      behavior: 'smooth' // 可选，使滚动平滑
+                    //                    });";
+                    var client = cefWebBrowser.GetDevToolsClient();
+                    if (client != null)
+                    {
+                        var result = client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
+                        result.Wait(5000);
+                    }
+
+                    if (getSpuItemsParams != null)
+                        break;
+                }
+
+                while (spuItemsBase != null && getSpuItemsParams != null && searchPageCount < pageEnd)
+                {
+
+                    if (cancellationTokenSource.IsCancellationRequested)
+                        break;
+
+                    int sleepTime = (int)(getDetailWaitSeconds * 1000) - 100 + Randomx.GetId(101, 501);
+                    Thread.Sleep(Math.Max(100, sleepTime));
+
+                    searchPageCount++;
+                    Invoke(new Action(() =>
+                    {
+                        statusBar.lblTaskStatus.Text = "当前翻页数：" + searchPageCount;
+                    }));
+                    if (searchPageCount % 10 == 0)
+                    {
+                        NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_sale_assistant_list_" + MainForm.ProcessCount, lstWxSaleAssistantSpuItemInfo);
+                    }
+
+                    List<Cookie> cookieList = CEFBrowser.GetCookieList("store.weixin.qq.com", cefWebBrowser.GetCookieManager(null));
+                    var cookieShop = new ShopLoginInfo();
+                    cookieShop.Cookies = JsonHelper.SerializeObject(cookieList);
+                    getSpuItemsParams["pageContext"]["pageContext"] = pageContext;
+                    getSpuItemsParams["requestContext"]["requestId"] = requestId;
+                    foreach (var item in spuItemsBase)
+                    {
+                        JObject jObjDisplaySpu = new JObject();
+                        jObjDisplaySpu["spuId"] = item.spu.id;
+                        (getSpuItemsParams["requestContext"]["displayedSpus"] as JArray).Add(jObjDisplaySpu);
+                    }
+
+                    //{"code":0,"pageContextResp":{"hasNext":false},"requestId":"1778688044492"}
+                    var spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams);
+                    if (!spuItemsData.Contains("\"code\":0") || spuItemsData.Contains("\"hasNext\":false"))
+                        spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams);
+                    if (!spuItemsData.Contains("\"code\":0") || spuItemsData.Contains("\"hasNext\":false"))
+                        spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams);
+                    if (!spuItemsData.Contains("\"code\":0") || spuItemsData.Contains("\"hasNext\":false"))
+                        spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams);
+                    if (!spuItemsData.Contains("\"code\":0") || spuItemsData.Contains("\"hasNext\":false"))
+                        spuItemsData = GetAssistant.wxGetAssistant(cookieShop, getSpuItemsParams);
+                    if (!spuItemsData.Contains("\"code\":0"))
+                    {
+                        BaseMsgForm.ShowError(spuItemsData);
+                        break;
+                    }
+                    if (spuItemsData.Contains("\"hasNext\":false"))
+                    {
+                        break;
+                    }
+
+                    pageContext = BaseRegex.GetStringJson(ref spuItemsData, "pageContext");
+                    requestId = BaseRegex.GetStringJson(ref spuItemsData, "requestId");
+
+                    var jObj = JsonHelper.JObjectParse(spuItemsData)["spuItems"];
+                    var spuItems = JsonHelper.DeserializeJsonToList<WXSaleAssistantSpuItemInfo>(JsonHelper.SerializeObject(jObj));
+                    spuItemsBase = spuItems;
+                    foreach (var spuItem in spuItems)
+                    {
+                        // 月销
+                        if (spuItem.spu.sales.monthlySales < filterMonthSaleCount)
+                            continue;
+                        // 总销
+                        if (spuItem.spu.sales.cumulativeSales < filterTotalSaleCount)
+                            continue;
+                        // 已加入橱窗
+                        if (chkSkipIsAddWindow.Checked && spuItem.shopWindow != null && spuItem.shopWindow.status == 1)
+                            continue;
+                        // 已存在
+                        if (lstWxSaleAssistantSpuItemInfo.Any(s => s.spu.id == spuItem.spu.id))
+                            continue;
+
+                        lstWxSaleAssistantSpuItemInfo.Add(spuItem);
+                        Invoke(new Action(() =>
+                        {
+                            var rowId = this.dgvProduct.Rows.Add(
+                                true,
+                                spuItem.shop.appId,
+                                spuItem.shop.name,
+                                spuItem.spu.id,
+                                spuItem.spu.headImage, //.Replace("https://", "http://"),
+                                DataGridViewExtension.defaultBitmap,
+                                spuItem.spu.name,
+                                spuItem.spu.sales.monthlySales,
+                                spuItem.spu.sales.cumulativeSales,
+                                "", // 没有类目信息，不填
+                                spuItem.spu.price.sellingPrice * 0.01m,
+                                "删除",
+                                spuItem.operateMsg
+                            );
+                            dgvProduct.Rows[rowId].Height = 60;
+                        }));
+                    }
+                }
+
+                if (!cancellationTokenSource.IsCancellationRequested)
+                    BaseMsgForm.ShowInfo("查询结束");
+                else
+                    BaseMsgForm.ShowInfo("查询中断");
+
+                Invoke(new Action(() => { pbLoading.Visible = false; }));
+
+            }, cancellationTokenSource.Token);
+        }
+
+        private void btnClear_Click(object sender, EventArgs e)
+        {
+            if (BaseMsgForm.ShowConfirm("确定清除选中商品吗？清除后不可恢复！").DialogResult == DialogResult.Cancel)
+                return;
+
+            var rows = this.dgvProduct.Rows.Cast<DataGridViewRow>().ToList(); //Cast后Rows做foreach循环时仍会夹花跳过，所以要ToList转一个新的数组。
+            foreach (var row in rows)
+            {
+                if (row.Cells["colCheck"].Value.ParseToBool() == true)
+                {
+                    var spuId = row.Cells["colProductId"].Value.ParseToString();
+                    lstWxSaleAssistantSpuItemInfo.RemoveAll(p => p.spu.id.ParseToString() == spuId);
+                    this.dgvProduct.Rows.Remove(row);
+                }
+            }
+            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_sale_assistant_list_" + MainForm.ProcessCount, lstWxSaleAssistantSpuItemInfo);
+        }
+    }
+
+    public class WXSaleAssistantSpuItemInfo
+    {
+        public string operateMsg;
+
+        public WXSaleAssistantSpuInfo spu { get; set; }
+        public WXSaleAssistantPromoteInfo promote { get; set; }
+        public WXSaleAssistantShopInfo shop { get; set; }
+        public object localLife { get;set;}
+        // 是否已加入橱窗，不为空切status为1表示已加入
+        public WXSaleAssistantShopWindowInfo shopWindow { get; set; }
+    }
+
+    public class WXSaleAssistantShopWindowInfo
+    {
+        public int? status { get; set; } // 1
+    }
+
+    public class WXSaleAssistantShopInfo
+    {
+        public string name { get; set; } // "海阔文化云上图书",
+        public string icon { get; set; } // "http://mmbiz.qpic.cn/sz_mmbiz_png/ZWUXBFWiasldM81seiaAjqom0sK2QKAkkD4hXX3iaWLeyKmUnyNfPy1iaZ774ia29lMIj1fVEtcZqqXrv4c66ROCgpQ/0?wx_fmt=png",
+        public WXSaleAssistantDetailedSellerRating detailedSellerRating { get; set; }
+        public string appId { get; set; } // "wx1517b163194b3eaa",
+        public string flag { get; set; } // "3"
+    }
+
+    public class WXSaleAssistantDetailedSellerRating
+    {
+        public WXSaleAssistantDetailedRating detailedRating { get; set; }
+        public WXSaleAssistantDetailedRating detailedSpuRating { get; set; }
+        public WXSaleAssistantDetailedRating detailedDeliverRating { get; set; }
+        public WXSaleAssistantDetailedRating detailedServiceRating { get; set; }
+    }
+
+    public class WXSaleAssistantDetailedRating
+    {
+        public int? score { get; set; } // 482,
+        public int? level { get; set; } // 2,
+        public int? abovePercent { get; set; } // 7122
+
+    }
+
+    public class WXSaleAssistantPromoteInfo
+    {
+        public WXSaleAssistantCommissionInfo commission { get; set; }
+    }
+
+    public class WXSaleAssistantCommissionInfo
+    {
+        public int? commissionRate { get; set; } // 500000,
+        public string commissionRateDesc { get; set; } // "佣金率50%",
+        public int? commission { get; set; } // 1490,
+        public string commissionType { get; set; } // 1
+
+    }
+
+    public class WXSaleAssistantSpuInfo
+    {
+        public string id { get; set; } // "10000666530619"
+        public string name { get; set; } // "懒鸟效应：激发孩子的成长力 养成自律的好习惯 告别拖延与分心",
+        public string headImage { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69d774500008a8161a1689b6ab95b01e000000a000004f50",
+        public WXSaleAssistantStockInfo stock { get; set; }
+        public WXSaleAssistantSalesInfo sales { get; set; }
+        public WXSaleAssistantPriceInfo price { get; set; }
+        public string shortName { get; set; } // "点击购买【懒鸟三生教育】"
+        public List<WXSaleAssistantGuaranteeShowInfo> guaranteeShows { get; set; }
+        public List<WXSaleAssistantBenefitInfo> benefits { get; set; }
+    }
+
+    public class WXSaleAssistantBenefitInfo
+    {   
+        public int? benefits { get; set; } // 0,
+        public string name { get; set; } // "限免服务费"
+
+    }
+
+
+    public class WXSaleAssistantGuaranteeShowInfo
+    {
+        public string desc { get; set; } // "7天无理由",
+        public int? tag { get; set; } // 4
+    }
+
+    public class WXSaleAssistantPriceInfo
+    {
+        public int? sellingPrice { get; set; } // 2980
+    }
+
+    public class WXSaleAssistantStockInfo
+    {
+        public int? totalStock { get; set; } // 3929912
+    }
+    public class WXSaleAssistantSalesInfo
+    {
+        /// <summary>
+        /// 月销量
+        /// </summary>
+        public int? monthlySales { get; set; } // 52421
+        /// <summary>
+        /// 总销量
+        /// </summary>
+        public int? cumulativeSales { get; set; } // 71960
+    }
+
+    public class GetAssistant
+    {
+        public static string wxGetAssistant(ShopLoginInfo shop, JObject wxCateAuthParam)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmeckolpoolnode/ecListSelectionSpuItems?token=&lang=zh_CN";
+            string referer = "https://store.weixin.qq.com/talent/pool/home";
+            string data = JsonHelper.SerializeObject(wxCateAuthParam);
+            var result = WXHttpResponseBLL.WeiXinAssistantPostResponse(shop, url, data, referer);
+            return result;
+        }
+    }
+}

TEMUKJD/WXForms/AdminForms/WXSaleAssistantForm.resx

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCoId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSupplierName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colImg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colGoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colHotValue.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSales30.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colDel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs

@@ -32,13 +32,13 @@ namespace TemuKJD.WXForms.ProductForms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
             this.chkRandomCompanyProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -90,13 +90,15 @@ namespace TemuKJD.WXForms.ProductForms
             this.label9 = new System.Windows.Forms.Label();
             this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.cmbHot = new System.Windows.Forms.ComboBox();
             this.btnProdDb = new DevComponents.DotNetBar.PanelEx();
             this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.txtAddCount = new System.Windows.Forms.TextBox();
+            this.cmbJstInitSet = new System.Windows.Forms.ComboBox();
             this.txtSearchGoodsName = new System.Windows.Forms.TextBox();
+            this.lblJstInitSet = new System.Windows.Forms.Label();
             this.pbSelectProd = new System.Windows.Forms.PictureBox();
             this.cmbSourceType = new System.Windows.Forms.ComboBox();
-            this.cmbJstInitSet = new System.Windows.Forms.ComboBox();
             this.cmbCateFilter3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
             this.label21 = new System.Windows.Forms.Label();
             this.cmbGroupFilter = new System.Windows.Forms.ComboBox();
@@ -117,8 +119,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.lblGroupFilter = new System.Windows.Forms.Label();
             this.lblWxSafe = new System.Windows.Forms.Label();
             this.label20 = new System.Windows.Forms.Label();
-            this.lblJstInitSet = new System.Windows.Forms.Label();
             this.lblIdFilter = new System.Windows.Forms.Label();
+            this.lblHot = new System.Windows.Forms.Label();
             this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
             this.btnRefreshAuthor = new DevComponents.DotNetBar.PanelEx();
             this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx();
@@ -948,13 +950,15 @@ 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.cmbHot);
             this.ucGroupBoxEx4.Controls.Add(this.btnProdDb);
             this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd);
             this.ucGroupBoxEx4.Controls.Add(this.txtAddCount);
+            this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet);
             this.ucGroupBoxEx4.Controls.Add(this.txtSearchGoodsName);
+            this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet);
             this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd);
             this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType);
-            this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet);
             this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter3);
             this.ucGroupBoxEx4.Controls.Add(this.label21);
             this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter);
@@ -975,8 +979,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.Controls.Add(this.lblGroupFilter);
             this.ucGroupBoxEx4.Controls.Add(this.lblWxSafe);
             this.ucGroupBoxEx4.Controls.Add(this.label20);
-            this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet);
             this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter);
+            this.ucGroupBoxEx4.Controls.Add(this.lblHot);
             this.ucGroupBoxEx4.Location = new System.Drawing.Point(162, 2);
             this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
             this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165);
@@ -984,6 +988,21 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.TabStop = false;
             this.ucGroupBoxEx4.Text = "待传商品";
             // 
+            // cmbHot
+            // 
+            this.cmbHot.FormattingEnabled = true;
+            this.cmbHot.Items.AddRange(new object[] {
+            "",
+            "爆款数据",
+            "普通商品"});
+            this.cmbHot.Location = new System.Drawing.Point(309, 73);
+            this.cmbHot.Name = "cmbHot";
+            this.cmbHot.Size = new System.Drawing.Size(92, 25);
+            this.cmbHot.TabIndex = 837;
+            this.cmbHot.Text = "普通商品";
+            this.cmbHot.Visible = false;
+            this.cmbHot.TextChanged += new System.EventHandler(this.cmbHot_TextChanged);
+            // 
             // btnProdDb
             // 
             this.btnProdDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -1010,7 +1029,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // chkWXComplateProd
             // 
-            this.chkWXComplateProd.Location = new System.Drawing.Point(180, 103);
+            this.chkWXComplateProd.Location = new System.Drawing.Point(277, 102);
             this.chkWXComplateProd.Name = "chkWXComplateProd";
             this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21);
             this.chkWXComplateProd.TabIndex = 807;
@@ -1028,15 +1047,40 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtAddCount.TabIndex = 536;
             this.txtAddCount.Text = "500";
             // 
+            // cmbJstInitSet
+            // 
+            this.cmbJstInitSet.FormattingEnabled = true;
+            this.cmbJstInitSet.Items.AddRange(new object[] {
+            "",
+            "已设置",
+            "未设置"});
+            this.cmbJstInitSet.Location = new System.Drawing.Point(178, 100);
+            this.cmbJstInitSet.Name = "cmbJstInitSet";
+            this.cmbJstInitSet.Size = new System.Drawing.Size(92, 25);
+            this.cmbJstInitSet.TabIndex = 697;
+            this.cmbJstInitSet.Text = "已设置";
+            this.cmbJstInitSet.Visible = false;
+            // 
             // txtSearchGoodsName
             // 
             this.txtSearchGoodsName.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtSearchGoodsName.Location = new System.Drawing.Point(178, 47);
+            this.txtSearchGoodsName.Location = new System.Drawing.Point(178, 46);
             this.txtSearchGoodsName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtSearchGoodsName.Name = "txtSearchGoodsName";
             this.txtSearchGoodsName.Size = new System.Drawing.Size(223, 25);
             this.txtSearchGoodsName.TabIndex = 795;
             // 
+            // lblJstInitSet
+            // 
+            this.lblJstInitSet.AutoSize = true;
+            this.lblJstInitSet.Location = new System.Drawing.Point(147, 104);
+            this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.lblJstInitSet.Name = "lblJstInitSet";
+            this.lblJstInitSet.Size = new System.Drawing.Size(32, 17);
+            this.lblJstInitSet.TabIndex = 696;
+            this.lblJstInitSet.Text = "分销";
+            this.lblJstInitSet.Visible = false;
+            // 
             // pbSelectProd
             // 
             this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue;
@@ -1062,7 +1106,7 @@ namespace TemuKJD.WXForms.ProductForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(47, 74);
+            this.cmbSourceType.Location = new System.Drawing.Point(47, 73);
             this.cmbSourceType.Name = "cmbSourceType";
             this.cmbSourceType.Size = new System.Drawing.Size(92, 25);
             this.cmbSourceType.TabIndex = 673;
@@ -1071,20 +1115,6 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_TextChanged);
             // 
-            // cmbJstInitSet
-            // 
-            this.cmbJstInitSet.FormattingEnabled = true;
-            this.cmbJstInitSet.Items.AddRange(new object[] {
-            "",
-            "已设置",
-            "未设置"});
-            this.cmbJstInitSet.Location = new System.Drawing.Point(309, 74);
-            this.cmbJstInitSet.Name = "cmbJstInitSet";
-            this.cmbJstInitSet.Size = new System.Drawing.Size(92, 25);
-            this.cmbJstInitSet.TabIndex = 697;
-            this.cmbJstInitSet.Text = "已设置";
-            this.cmbJstInitSet.Visible = false;
-            // 
             // cmbCateFilter3
             // 
             this.cmbCateFilter3.DefaultText = "全部";
@@ -1092,7 +1122,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCateFilter3.DropDownWidth = 1;
             this.cmbCateFilter3.FormattingEnabled = true;
             this.cmbCateFilter3.IntegralHeight = false;
-            this.cmbCateFilter3.Location = new System.Drawing.Point(309, 20);
+            this.cmbCateFilter3.Location = new System.Drawing.Point(309, 19);
             this.cmbCateFilter3.Name = "cmbCateFilter3";
             this.cmbCateFilter3.Size = new System.Drawing.Size(92, 25);
             this.cmbCateFilter3.TabIndex = 710;
@@ -1103,7 +1133,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label21
             // 
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(271, 24);
+            this.label21.Location = new System.Drawing.Point(271, 23);
             this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label21.Name = "label21";
             this.label21.Size = new System.Drawing.Size(39, 17);
@@ -1113,7 +1143,7 @@ namespace TemuKJD.WXForms.ProductForms
             // cmbGroupFilter
             // 
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(178, 74);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(178, 73);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
             this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25);
             this.cmbGroupFilter.TabIndex = 641;
@@ -1136,7 +1166,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCateFilter2.DropDownWidth = 1;
             this.cmbCateFilter2.FormattingEnabled = true;
             this.cmbCateFilter2.IntegralHeight = false;
-            this.cmbCateFilter2.Location = new System.Drawing.Point(178, 20);
+            this.cmbCateFilter2.Location = new System.Drawing.Point(178, 19);
             this.cmbCateFilter2.Name = "cmbCateFilter2";
             this.cmbCateFilter2.Size = new System.Drawing.Size(92, 25);
             this.cmbCateFilter2.TabIndex = 708;
@@ -1147,7 +1177,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(140, 24);
+            this.label19.Location = new System.Drawing.Point(140, 23);
             this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(39, 17);
@@ -1160,7 +1190,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClearFilter.Location = new System.Drawing.Point(368, 101);
+            this.btnClearFilter.Location = new System.Drawing.Point(368, 100);
             this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearFilter.Name = "btnClearFilter";
             this.btnClearFilter.Size = new System.Drawing.Size(33, 25);
@@ -1198,7 +1228,7 @@ namespace TemuKJD.WXForms.ProductForms
             "安全+未校验",
             "安全商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(47, 47);
+            this.cmbWxSafe.Location = new System.Drawing.Point(47, 46);
             this.cmbWxSafe.Name = "cmbWxSafe";
             this.cmbWxSafe.Size = new System.Drawing.Size(92, 25);
             this.cmbWxSafe.TabIndex = 675;
@@ -1237,7 +1267,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCateFilter1.DropDownWidth = 1;
             this.cmbCateFilter1.FormattingEnabled = true;
             this.cmbCateFilter1.IntegralHeight = false;
-            this.cmbCateFilter1.Location = new System.Drawing.Point(47, 20);
+            this.cmbCateFilter1.Location = new System.Drawing.Point(47, 19);
             this.cmbCateFilter1.Name = "cmbCateFilter1";
             this.cmbCateFilter1.Size = new System.Drawing.Size(92, 25);
             this.cmbCateFilter1.TabIndex = 663;
@@ -1248,7 +1278,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(9, 24);
+            this.label2.Location = new System.Drawing.Point(9, 23);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(39, 17);
@@ -1295,19 +1325,18 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // chkSevenDays
             // 
-            this.chkSevenDays.AutoSize = true;
-            this.chkSevenDays.Location = new System.Drawing.Point(282, 103);
+            this.chkSevenDays.Location = new System.Drawing.Point(7, 127);
             this.chkSevenDays.Name = "chkSevenDays";
-            this.chkSevenDays.Size = new System.Drawing.Size(87, 21);
+            this.chkSevenDays.Size = new System.Drawing.Size(87, 17);
             this.chkSevenDays.TabIndex = 805;
             this.chkSevenDays.Text = "近七日爆款";
             this.chkSevenDays.UseVisualStyleBackColor = true;
             // 
             // chkSkipQualification
             // 
-            this.chkSkipQualification.Location = new System.Drawing.Point(7, 133);
+            this.chkSkipQualification.Location = new System.Drawing.Point(7, 144);
             this.chkSkipQualification.Name = "chkSkipQualification";
-            this.chkSkipQualification.Size = new System.Drawing.Size(87, 21);
+            this.chkSkipQualification.Size = new System.Drawing.Size(87, 17);
             this.chkSkipQualification.TabIndex = 806;
             this.chkSkipQualification.Text = "跳过资质商品";
             this.chkSkipQualification.UseVisualStyleBackColor = true;
@@ -1315,7 +1344,7 @@ namespace TemuKJD.WXForms.ProductForms
             // lblSourceType
             // 
             this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(16, 78);
+            this.lblSourceType.Location = new System.Drawing.Point(16, 77);
             this.lblSourceType.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblSourceType.Name = "lblSourceType";
             this.lblSourceType.Size = new System.Drawing.Size(32, 17);
@@ -1326,7 +1355,7 @@ namespace TemuKJD.WXForms.ProductForms
             // lblGroupFilter
             // 
             this.lblGroupFilter.AutoSize = true;
-            this.lblGroupFilter.Location = new System.Drawing.Point(147, 78);
+            this.lblGroupFilter.Location = new System.Drawing.Point(147, 77);
             this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblGroupFilter.Name = "lblGroupFilter";
             this.lblGroupFilter.Size = new System.Drawing.Size(32, 17);
@@ -1337,7 +1366,7 @@ namespace TemuKJD.WXForms.ProductForms
             // lblWxSafe
             // 
             this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(4, 50);
+            this.lblWxSafe.Location = new System.Drawing.Point(4, 49);
             this.lblWxSafe.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblWxSafe.Name = "lblWxSafe";
             this.lblWxSafe.Size = new System.Drawing.Size(44, 17);
@@ -1347,24 +1376,13 @@ namespace TemuKJD.WXForms.ProductForms
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(147, 51);
+            this.label20.Location = new System.Drawing.Point(147, 50);
             this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(32, 17);
             this.label20.TabIndex = 794;
             this.label20.Text = "标题";
             // 
-            // lblJstInitSet
-            // 
-            this.lblJstInitSet.AutoSize = true;
-            this.lblJstInitSet.Location = new System.Drawing.Point(278, 78);
-            this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.lblJstInitSet.Name = "lblJstInitSet";
-            this.lblJstInitSet.Size = new System.Drawing.Size(32, 17);
-            this.lblJstInitSet.TabIndex = 696;
-            this.lblJstInitSet.Text = "分销";
-            this.lblJstInitSet.Visible = false;
-            // 
             // lblIdFilter
             // 
             this.lblIdFilter.AutoSize = true;
@@ -1376,6 +1394,17 @@ namespace TemuKJD.WXForms.ProductForms
             this.lblIdFilter.Text = "ID";
             this.lblIdFilter.Visible = false;
             // 
+            // lblHot
+            // 
+            this.lblHot.AutoSize = true;
+            this.lblHot.Location = new System.Drawing.Point(278, 77);
+            this.lblHot.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.lblHot.Name = "lblHot";
+            this.lblHot.Size = new System.Drawing.Size(32, 17);
+            this.lblHot.TabIndex = 836;
+            this.lblHot.Text = "爆品";
+            this.lblHot.Visible = false;
+            // 
             // ucGroupBoxEx1
             // 
             this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -1773,19 +1802,19 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.dgvShop.AllowUserToAddRows = false;
             this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvShop.AutoRowNumber = true;
             this.dgvShop.BackgroundColor = System.Drawing.Color.White;
             this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -2005,19 +2034,19 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
             this.dgvSelectProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvSelectProduct.AutoRowNumber = true;
             this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
             this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCheck,
@@ -2078,8 +2107,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colSupplierName
             // 
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
             this.colSupplierName.Frozen = true;
             this.colSupplierName.HeaderText = "店铺名称";
             this.colSupplierName.Name = "colSupplierName";
@@ -2157,8 +2186,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colProductName
             // 
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
             this.colProductName.HeaderText = "商品标题";
             this.colProductName.Name = "colProductName";
             this.colProductName.ReadOnly = true;
@@ -2218,8 +2247,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // colAddTime
             // 
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle7;
             this.colAddTime.HeaderText = "上传时间";
             this.colAddTime.Name = "colAddTime";
             this.colAddTime.ReadOnly = true;
@@ -2523,5 +2552,7 @@ namespace TemuKJD.WXForms.ProductForms
         private UserComponent.UcComboBoxMutiSelect cmbCateFilter1;
         private UserComponent.UcComboBoxMutiSelect cmbCateFilter3;
         private UserComponent.UcComboBoxMutiSelect cmbCateFilter2;
+        private System.Windows.Forms.ComboBox cmbHot;
+        private System.Windows.Forms.Label lblHot;
     }
 }

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs

@@ -296,10 +296,13 @@ namespace TemuKJD.WXForms.ProductForms
                 cmbGroupFilter.Visible = true;
                 lblJstInitSet.Visible = true;
                 cmbJstInitSet.Visible = true;
+                lblHot.Visible = true;
+                cmbHot.Visible = true;
             }
 
             if (BaseClass.UserAuthority.ParseToString().Contains("货源选择"))
             {
+                lblSourceType.Visible = true;
                 cmbSourceType.Visible = true;
                 if (!string.IsNullOrWhiteSpace(cmbSourceType.Text))
                 {
@@ -312,7 +315,17 @@ namespace TemuKJD.WXForms.ProductForms
                 chkWXComplateProd.Visible = true;
                 chkUseWXComplateProd.Visible = true;
             }
-//#endif
+            if (BaseClass.UserAuthority.ParseToString().Contains("爆款数据"))
+            {
+                lblHot.Visible = true;
+                cmbHot.Visible = true;
+                if (!string.IsNullOrWhiteSpace(cmbSourceType.Text))
+                {
+                    lblGroupFilter.Visible = true;
+                    cmbGroupFilter.Visible = true;
+                }
+            }
+            //#endif
             if (BaseClass.SaLevel == 1)
             {
                 //chkImgRandomBlock.Visible = true;
@@ -476,7 +489,11 @@ namespace TemuKJD.WXForms.ProductForms
             string sourceType = cmbSourceType.Text.Trim();
             Task.Run(() =>
             {
-                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); // 同时刷新下商品分组
+                // 同时刷新下商品分组
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", addUserName); // 同时刷新下商品分组
                 GetPddProductCate();
                 Invoke(new Action(() =>
                 {
@@ -506,7 +523,7 @@ namespace TemuKJD.WXForms.ProductForms
 
             Invoke(new Action(() =>
             {
-                if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采")
+                if (cmbSourceType.Text.Trim() != "厂商直采" && cmbSourceType.Text.Trim() != "微信店采" && cmbSourceType.Text.Trim() != "微信小店")
                 {
                     fillPddCate();
                 }
@@ -1254,6 +1271,8 @@ namespace TemuKJD.WXForms.ProductForms
                 data += "&wx_safe_status=安全商品,未校验";
             if (noBanWx)
                 data += "&ban_wx=0";
+            if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
+                data += "&special_prod_type=普通商品,书籍,爆款数据";
 
             var html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -1355,7 +1374,9 @@ namespace TemuKJD.WXForms.ProductForms
             #region 跳过已上传商品
             if (chkSkipUploaded.Checked)
             {
-                var searchExtCode = "EC1" + dbProd.spu_id + "A";
+                var searchExtCode = dbProd.ext_code;
+                if (searchExtCode.ParseToString().Length < 10)
+                    searchExtCode = "EC1" + dbProd.spu_id + "A";
                 if (dbProd.sku_secret_json != null && dbProd.sku_secret_json.Contains("goodsId"))
                 {
                     var sku_secret_json = dbProd.sku_secret_json;
@@ -1803,7 +1824,7 @@ namespace TemuKJD.WXForms.ProductForms
 
             #region  设置货号
             var extCode = dbProd.ext_code.IsNullOrEmpty() ? prodInfo.detail.out_goods_sn : dbProd.ext_code;
-            if (extCode.IsNullOrEmpty() || extCode.Length < 4)
+            if (extCode.IsNullOrEmpty() || extCode.Length <= 10)
             {
                 //extCode = "EC" + Randomx.GetId(1000).ToString().PadLeft(3, '0') + dbProd.spu_id + "C";
                 extCode = "EC1" + dbProd.spu_id + "A";
@@ -2609,8 +2630,24 @@ namespace TemuKJD.WXForms.ProductForms
                     error = expressRst;
                 return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + error + "\"}";
             }
-            upProdParam.product.info.expressInfo = new expressInfoParam();
-            upProdParam.product.info.expressInfo.templateId = BaseRegex.GetStringJson(ref expressRst, "templateId");
+            try
+            {
+                var addressArr = JsonHelper.JObjectParse(expressRst)["freightTemplateList"];
+                foreach (var addressObj in addressArr)
+                {
+                    if (addressObj["isDefault"].ParseToInt() == 1)
+                    {
+                        string templateId = addressObj["templateId"].ParseToString();
+                        upProdParam.product.info.expressInfo = new expressInfoParam();
+                        upProdParam.product.info.expressInfo.templateId = templateId; // BaseRegex.GetStringJson(ref expressRst, "templateId");
+                        break;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"运费模板获取失败 " + ex.Message + "\"}";
+            }
             #endregion
 
             #region 详情图
@@ -3064,7 +3101,7 @@ namespace TemuKJD.WXForms.ProductForms
                         else if (attr.value == "ml")
                         {
                             if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith(attr.value))
-                                attrValue = propInfo.values.FirstOrDefault()?.value;
+                                attrValue = propInfo.values.FirstOrDefault()?.value.TrimStart('-', ' ');
                             else
                                 attrValue = "100 ml";
                         }
@@ -3567,6 +3604,11 @@ namespace TemuKJD.WXForms.ProductForms
                 skuParam.productSkuInfo.salePrice += (shipPrice * defaultAddPriceRule.ShippingPriceTimes).ParseToInt();
                 // sku图
                 skuParam.productSkuInfo.thumbImg = upProdParam.product.info.productSaleAttrs[0].items.FirstOrDefault(a => a.value == skuInfo.spec[0].spec_name)?.imgUrl;
+                if (dbProd.special_prod_type == "爆款数据")
+                {
+                    if (!skuInfo.out_sku_sn.StartsWith("BS")) // Best-seller 爆款
+                        skuInfo.out_sku_sn = "BS" + skuInfo.out_sku_sn;
+                }
                 skuParam.productSkuInfo.skuCode = skuInfo.out_sku_sn;
                 skuParam.productSkuInfo.outSkuId = skuInfo.out_sku_sn;
                 skuParam.productSkuInfo.out_sku_id = skuInfo.out_sku_sn;
@@ -4465,18 +4507,26 @@ namespace TemuKJD.WXForms.ProductForms
                 data = UserLogin.GetSignaturex() +
                     "&page=" + 1 +
                     "&page_size=" + pageSize;
-                data += "&ban_wx=0";
                 if (isNotCount)
                 {
                     data += "&is_not_count=" + true;
                     data += "&prod_count=" + totalProdCount;
                 }
+                data += "&ban_wx=0";
+
                 data += "&in_ext_codes=" + txtExtCodeFilter.Text;
                 data += "&in_spu_ids=" + txtIdFilter.Text;
                 data += "&in_groups=" + cmbGroupFilter.Text;
+                data += "&product_name=" + txtSearchGoodsName.Text.Trim();
 
-                data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin");
+                // 同时刷新下商品分组
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                data += "&add_user_name=" + addUserName;
 
+                // 采集来源判断
+                data += "&product_get_type=" + cmbSourceType.Text.Trim();
                 if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店")
                     data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text);
                 else
@@ -4520,14 +4570,24 @@ namespace TemuKJD.WXForms.ProductForms
                     if (!string.IsNullOrEmpty(cmbCateFilter3.Text) && selectCate3?.Count > 0)
                         data += "&wx_cat_3=" + string.Join(",", selectCate3.Select(c => c.cat_id).ToList());
                 }
-                data += "&product_get_type=" + cmbSourceType.Text.Trim();
-                data += "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验");
-                data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim();
-                data += "&product_name=" + txtSearchGoodsName.Text.Trim();
 
+                // 爆款数据商品
+                if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim()))
+                    data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍");
+                else
+                    data += "&special_prod_type=普通商品,书籍";
+
+                // 聚水潭商品处理条件校验
+                data += "&is_supplier_prod_ok=" + cmbJstInitSet.Text.Trim();
+
+                // 微信安全商品检测
+                data += "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验");
+
+                // 7天爆款数据
                 if (chkSevenDays.Checked)
                     data += "&add_days_less=21";
 
+                // 回采数据
                 if (chkWXComplateProd.Checked)
                     data += "&has_wx_format=1";
             }));
@@ -4748,6 +4808,7 @@ namespace TemuKJD.WXForms.ProductForms
             cmbCateFilter1.Text = "";
             cmbWxSafe.Text = "安全+未校验";
             cmbSourceType.Text = "厂商直采";
+            cmbHot.Text = "普通商品";
             chkSkipQualification.Checked = false;
 
             int prodCount;
@@ -4941,7 +5002,11 @@ namespace TemuKJD.WXForms.ProductForms
             string sourceType = cmbSourceType.Text.Trim();
             Task.Run(() =>
             {
-                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); // 同时刷新下商品分组
+                // 同时刷新下商品分组
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", addUserName); // 同时刷新下商品分组
             });
             if (!string.IsNullOrWhiteSpace(cmbSourceType.Text))
             {
@@ -5248,6 +5313,20 @@ namespace TemuKJD.WXForms.ProductForms
                 lblWaitToUp.Text = "待上传 " + lstTemuDBProductSelect.Count + " 件";
             }));
         }
+
+        private void cmbHot_TextChanged(object sender, EventArgs e)
+        {
+            if (cmbHot.Text == "爆款数据")
+            {
+                cmbSourceType.Text = "";
+                cmbJstInitSet.Text = "未设置";
+            }
+            else
+            {
+                cmbSourceType.Text = "厂商直采";
+                cmbJstInitSet.Text = "已设置";
+            }
+        }
     }
 
     public class WXUpload

TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.resx

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopLoginName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colApi.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCanUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUploadCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOnSaleNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colRemaining.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMessage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSelectId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSupplierId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSupplierName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colLogin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colInShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colDraftId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductSkcPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuFakeImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuFakeImg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductCat.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSoldNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPreSale.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUserNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColDelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAddTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOpResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

TEMUKJD/WXForms/ProductForms/WXProdPreSaleForm.Designer.cs

@@ -209,9 +209,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx3.Controls.Add(this.btnStopUpDownOrDel);
             this.ucGroupBoxEx3.Controls.Add(this.btnClearList);
             this.ucGroupBoxEx3.Controls.Add(this.btnDown);
-            this.ucGroupBoxEx3.Location = new System.Drawing.Point(995, 2);
+            this.ucGroupBoxEx3.Location = new System.Drawing.Point(994, 2);
             this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
-            this.ucGroupBoxEx3.Size = new System.Drawing.Size(349, 165);
+            this.ucGroupBoxEx3.Size = new System.Drawing.Size(350, 165);
             this.ucGroupBoxEx3.TabIndex = 668;
             this.ucGroupBoxEx3.TabStop = false;
             this.ucGroupBoxEx3.Text = "商品下架";
@@ -223,7 +223,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnBatchRealDel.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnBatchRealDel.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnBatchRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnBatchRealDel.Location = new System.Drawing.Point(243, 91);
+            this.btnBatchRealDel.Location = new System.Drawing.Point(244, 91);
             this.btnBatchRealDel.Name = "btnBatchRealDel";
             this.btnBatchRealDel.Size = new System.Drawing.Size(84, 23);
             this.btnBatchRealDel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -296,7 +296,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnBatchDel.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnBatchDel.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnBatchDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnBatchDel.Location = new System.Drawing.Point(243, 61);
+            this.btnBatchDel.Location = new System.Drawing.Point(244, 61);
             this.btnBatchDel.Name = "btnBatchDel";
             this.btnBatchDel.Size = new System.Drawing.Size(84, 23);
             this.btnBatchDel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -363,7 +363,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnStopUpDownOrDel.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnStopUpDownOrDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnStopUpDownOrDel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStopUpDownOrDel.Location = new System.Drawing.Point(243, 121);
+            this.btnStopUpDownOrDel.Location = new System.Drawing.Point(244, 121);
             this.btnStopUpDownOrDel.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnStopUpDownOrDel.Name = "btnStopUpDownOrDel";
             this.btnStopUpDownOrDel.Size = new System.Drawing.Size(84, 23);
@@ -389,7 +389,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnClearList.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnClearList.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnClearList.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClearList.Location = new System.Drawing.Point(32, 121);
+            this.btnClearList.Location = new System.Drawing.Point(33, 121);
             this.btnClearList.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearList.Name = "btnClearList";
             this.btnClearList.Size = new System.Drawing.Size(84, 23);
@@ -416,7 +416,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnDown.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnDown.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDown.Location = new System.Drawing.Point(243, 31);
+            this.btnDown.Location = new System.Drawing.Point(244, 31);
             this.btnDown.Name = "btnDown";
             this.btnDown.Size = new System.Drawing.Size(84, 23);
             this.btnDown.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -450,7 +450,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.Controls.Add(this.btnStop);
             this.ucGroupBoxEx2.Controls.Add(this.btnClearDgv);
             this.ucGroupBoxEx2.Controls.Add(this.btnSetPreSale);
-            this.ucGroupBoxEx2.Location = new System.Drawing.Point(571, 2);
+            this.ucGroupBoxEx2.Location = new System.Drawing.Point(570, 2);
             this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
             this.ucGroupBoxEx2.Size = new System.Drawing.Size(425, 165);
             this.ucGroupBoxEx2.TabIndex = 667;
@@ -609,7 +609,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.Controls.Add(this.lblExtCodeFilter);
             this.ucGroupBoxEx4.Controls.Add(this.btnSearchProd);
             this.ucGroupBoxEx4.Controls.Add(this.label5);
-            this.ucGroupBoxEx4.Location = new System.Drawing.Point(162, 2);
+            this.ucGroupBoxEx4.Location = new System.Drawing.Point(161, 2);
             this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
             this.ucGroupBoxEx4.Size = new System.Drawing.Size(410, 165);
             this.ucGroupBoxEx4.TabIndex = 666;
@@ -849,7 +849,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx1.Controls.Add(this.txtFilterShopName);
             this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
             this.ucGroupBoxEx1.Controls.Add(this.label17);
-            this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
+            this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
             this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
             this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165);
             this.ucGroupBoxEx1.TabIndex = 399;

TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs

@@ -30,17 +30,19 @@
         {
             System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("选品上传");
             System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("商品预售/下架");
-            System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("爆单神器");
-            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("达人广场");
-            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("商品同步");
-            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("机会商品采集");
-            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("清理无流量");
+            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("爆单神器");
+            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("达人广场");
+            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品同步");
+            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("机会商品采集");
+            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
             treeNode4,
             treeNode5,
-            treeNode6});
+            treeNode6,
+            treeNode7});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -135,18 +137,20 @@
             treeNode1.Text = "选品上传";
             treeNode2.Name = "商品预售/下架";
             treeNode2.Text = "商品预售/下架";
-            treeNode3.Name = "爆单神器";
-            treeNode3.Text = "爆单神器";
-            treeNode4.Name = "达人广场";
-            treeNode4.Text = "达人广场";
-            treeNode5.Name = "商品同步";
-            treeNode5.Text = "商品同步";
-            treeNode6.Name = "机会商品采集";
-            treeNode6.Text = "机会商品采集";
-            treeNode7.Name = "商品管理";
-            treeNode7.Text = "商品管理";
+            treeNode3.Name = "清理无流量";
+            treeNode3.Text = "清理无流量";
+            treeNode4.Name = "爆单神器";
+            treeNode4.Text = "爆单神器";
+            treeNode5.Name = "达人广场";
+            treeNode5.Text = "达人广场";
+            treeNode6.Name = "商品同步";
+            treeNode6.Text = "商品同步";
+            treeNode7.Name = "机会商品采集";
+            treeNode7.Text = "机会商品采集";
+            treeNode8.Name = "商品管理";
+            treeNode8.Text = "商品管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode7});
+            treeNode8});
             this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
             this.tv.Size = new System.Drawing.Size(140, 521);
             this.tv.TabIndex = 1;

TEMUKJD/WXForms/ProductForms/WXProductForm.cs

@@ -19,6 +19,7 @@ namespace TemuKJD.WXForms.ProductForms
         public static WXProductForm instance;
         public Lazy<WXDBProdUploadForm> userSelectDbProductForm = new Lazy<WXDBProdUploadForm>();
         public Lazy<WXProdPreSaleForm> wxProdPreSaleForm = new Lazy<WXProdPreSaleForm>();
+        public Lazy<WXProdClearNoVisitForm> wxProdClearNoVisitForm = new Lazy<WXProdClearNoVisitForm>();
         public Lazy<WXProdCouponOrderBoomForm> wxProdCouponForm = new Lazy<WXProdCouponOrderBoomForm>();
         public Lazy<WXProdSyncForm> wxProdSyncForm = new Lazy<WXProdSyncForm>();
         public Lazy<WXFinderSquareForm> wxFinderSquareForm = new Lazy<WXFinderSquareForm>();
@@ -32,7 +33,7 @@ namespace TemuKJD.WXForms.ProductForms
             {
                 tv.SelectedNode = tv.Nodes[0].Nodes[0];
                 tv.ExpandGroup(tv.Nodes[0].Name);
-                List<string> hideName = new List<string>() { "机会商品采集", "商品列表", "爆单神器1", "商品同步1" };
+                List<string> hideName = new List<string>() { "清理无流量", "机会商品采集", "商品列表", "爆单神器1", "商品同步1" };
 
                 if (BaseClass.UserAuthority.Contains("机会商品采集"))
                     hideName.Remove("机会商品采集");
@@ -79,6 +80,9 @@ namespace TemuKJD.WXForms.ProductForms
                         case "商品预售/下架":
                             SetForm(wxProdPreSaleForm.Value);
                             break;
+                        case "清理无流量":
+                            SetForm(wxProdClearNoVisitForm.Value);
+                            break;
                         case "爆单神器":
                             SetForm(wxProdCouponForm.Value);
                             break;

TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs

@@ -51,15 +51,13 @@ namespace TemuKJD.WXForms.ProductForms
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserProdListForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lblSetShop = new System.Windows.Forms.Label();
+            this.cmbRelation = new System.Windows.Forms.ComboBox();
+            this.lblRelation = new System.Windows.Forms.Label();
             this.btnSetShop = new DevComponents.DotNetBar.PanelEx();
             this.btnSelect = new DevComponents.DotNetBar.PanelEx();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.lblRelation = new System.Windows.Forms.Label();
-            this.txtCatBoundLessThan = new System.Windows.Forms.TextBox();
-            this.txtCatBoundMoreThan = new System.Windows.Forms.TextBox();
-            this.chkCatBoundLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components);
-            this.chkCatBoundMoreThan = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.cmbHot = new System.Windows.Forms.ComboBox();
+            this.lblHot = new System.Windows.Forms.Label();
             this.btnSearch = new DevComponents.DotNetBar.PanelEx();
             this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
             this.cmbCat3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
@@ -72,11 +70,15 @@ namespace TemuKJD.WXForms.ProductForms
             this.label3 = new System.Windows.Forms.Label();
             this.lblWxSafe = new System.Windows.Forms.Label();
             this.cmbWxSafe = new System.Windows.Forms.ComboBox();
-            this.lblGroup = new System.Windows.Forms.Label();
+            this.chkCatBoundMoreThan = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.txtCatBoundMoreThan = new System.Windows.Forms.TextBox();
+            this.chkCatBoundLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.txtCatBoundLessThan = new System.Windows.Forms.TextBox();
             this.cmbGroupFilter = new System.Windows.Forms.ComboBox();
-            this.cmbSourceType = new System.Windows.Forms.ComboBox();
             this.lblSourceType = new System.Windows.Forms.Label();
-            this.cmbRelation = new System.Windows.Forms.ComboBox();
+            this.lblGroup = new System.Windows.Forms.Label();
+            this.cmbSourceType = new System.Windows.Forms.ComboBox();
+            this.lblSetShop = new System.Windows.Forms.Label();
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.btnStopStop = new DevComponents.DotNetBar.PanelEx();
             this.pnlSetShop = new System.Windows.Forms.Panel();
@@ -181,10 +183,12 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // splitContainer1.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.lblSetShop);
+            this.splitContainer1.Panel1.Controls.Add(this.cmbRelation);
+            this.splitContainer1.Panel1.Controls.Add(this.lblRelation);
             this.splitContainer1.Panel1.Controls.Add(this.btnSetShop);
             this.splitContainer1.Panel1.Controls.Add(this.btnSelect);
             this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
+            this.splitContainer1.Panel1.Controls.Add(this.lblSetShop);
             // 
             // splitContainer1.Panel2
             // 
@@ -193,18 +197,32 @@ namespace TemuKJD.WXForms.ProductForms
             this.splitContainer1.SplitterDistance = 74;
             this.splitContainer1.TabIndex = 1;
             // 
-            // lblSetShop
+            // cmbRelation
             // 
-            this.lblSetShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.lblSetShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblSetShop.ForeColor = System.Drawing.Color.DarkOrange;
-            this.lblSetShop.Location = new System.Drawing.Point(1206, 45);
-            this.lblSetShop.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.lblSetShop.Name = "lblSetShop";
-            this.lblSetShop.Size = new System.Drawing.Size(214, 17);
-            this.lblSetShop.TabIndex = 718;
-            this.lblSetShop.Text = "指定店铺：";
-            this.lblSetShop.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.cmbRelation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbRelation.FormattingEnabled = true;
+            this.cmbRelation.Items.AddRange(new object[] {
+            "",
+            "是",
+            "否"});
+            this.cmbRelation.Location = new System.Drawing.Point(1267, 42);
+            this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbRelation.Name = "cmbRelation";
+            this.cmbRelation.Size = new System.Drawing.Size(153, 25);
+            this.cmbRelation.TabIndex = 882;
+            this.cmbRelation.Visible = false;
+            // 
+            // lblRelation
+            // 
+            this.lblRelation.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.lblRelation.AutoSize = true;
+            this.lblRelation.Location = new System.Drawing.Point(1201, 46);
+            this.lblRelation.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.lblRelation.Name = "lblRelation";
+            this.lblRelation.Size = new System.Drawing.Size(68, 17);
+            this.lblRelation.TabIndex = 884;
+            this.lblRelation.Text = "数据转换：";
+            this.lblRelation.Visible = false;
             // 
             // btnSetShop
             // 
@@ -273,11 +291,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.lblRelation, 8, 1);
-            this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 5, 1);
-            this.tableLayoutPanel1.Controls.Add(this.txtCatBoundMoreThan, 3, 1);
-            this.tableLayoutPanel1.Controls.Add(this.chkCatBoundLessThan, 4, 1);
-            this.tableLayoutPanel1.Controls.Add(this.chkCatBoundMoreThan, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cmbHot, 9, 0);
+            this.tableLayoutPanel1.Controls.Add(this.lblHot, 8, 0);
             this.tableLayoutPanel1.Controls.Add(this.btnSearch, 10, 0);
             this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 11, 0);
             this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 7, 0);
@@ -290,11 +305,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 1, 1);
-            this.tableLayoutPanel1.Controls.Add(this.lblGroup, 8, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 9, 0);
-            this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 7, 1);
+            this.tableLayoutPanel1.Controls.Add(this.chkCatBoundMoreThan, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.txtCatBoundMoreThan, 3, 1);
+            this.tableLayoutPanel1.Controls.Add(this.chkCatBoundLessThan, 4, 1);
+            this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 5, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 9, 1);
             this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 6, 1);
-            this.tableLayoutPanel1.Controls.Add(this.cmbRelation, 9, 1);
+            this.tableLayoutPanel1.Controls.Add(this.lblGroup, 8, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 7, 1);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
@@ -304,63 +322,34 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.Size = new System.Drawing.Size(1193, 105);
             this.tableLayoutPanel1.TabIndex = 679;
             // 
-            // lblRelation
+            // cmbHot
             // 
-            this.lblRelation.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.lblRelation.AutoSize = true;
-            this.lblRelation.Location = new System.Drawing.Point(870, 44);
-            this.lblRelation.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-            this.lblRelation.Name = "lblRelation";
-            this.lblRelation.Size = new System.Drawing.Size(68, 17);
-            this.lblRelation.TabIndex = 884;
-            this.lblRelation.Text = "数据转换：";
-            this.lblRelation.Visible = false;
+            this.cmbHot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbHot.FormattingEnabled = true;
+            this.cmbHot.Items.AddRange(new object[] {
+            "",
+            "爆款数据",
+            "普通商品"});
+            this.cmbHot.Location = new System.Drawing.Point(934, 7);
+            this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbHot.Name = "cmbHot";
+            this.cmbHot.Size = new System.Drawing.Size(151, 25);
+            this.cmbHot.TabIndex = 882;
+            this.cmbHot.Text = "普通商品";
+            this.cmbHot.Visible = false;
+            this.cmbHot.TextChanged += new System.EventHandler(this.cmbHot_TextChanged);
             // 
-            // txtCatBoundLessThan
+            // lblHot
             // 
-            this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundLessThan.Location = new System.Drawing.Point(515, 41);
-            this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.txtCatBoundLessThan.Name = "txtCatBoundLessThan";
-            this.txtCatBoundLessThan.Size = new System.Drawing.Size(146, 23);
-            this.txtCatBoundLessThan.TabIndex = 883;
-            this.txtCatBoundLessThan.Text = "100000";
-            this.txtCatBoundLessThan.Visible = false;
-            // 
-            // txtCatBoundMoreThan
-            // 
-            this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(293, 41);
-            this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan";
-            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(146, 23);
-            this.txtCatBoundMoreThan.TabIndex = 882;
-            this.txtCatBoundMoreThan.Text = "1000";
-            this.txtCatBoundMoreThan.Visible = false;
-            // 
-            // chkCatBoundLessThan
-            // 
-            this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundLessThan.Location = new System.Drawing.Point(448, 42);
-            this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.chkCatBoundLessThan.Name = "chkCatBoundLessThan";
-            this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21);
-            this.chkCatBoundLessThan.TabIndex = 882;
-            this.chkCatBoundLessThan.Text = "保证金≤";
-            this.chkCatBoundLessThan.UseVisualStyleBackColor = true;
-            this.chkCatBoundLessThan.CheckedChanged += new System.EventHandler(this.chkCatBoundLessThan_CheckedChanged);
-            // 
-            // chkCatBoundMoreThan
-            // 
-            this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(226, 42);
-            this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan";
-            this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21);
-            this.chkCatBoundMoreThan.TabIndex = 815;
-            this.chkCatBoundMoreThan.Text = "保证金≥";
-            this.chkCatBoundMoreThan.UseVisualStyleBackColor = true;
-            this.chkCatBoundMoreThan.CheckedChanged += new System.EventHandler(this.chkCatBoundMoreThan_CheckedChanged);
+            this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.lblHot.AutoSize = true;
+            this.lblHot.Location = new System.Drawing.Point(890, 9);
+            this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.lblHot.Name = "lblHot";
+            this.lblHot.Size = new System.Drawing.Size(44, 17);
+            this.lblHot.TabIndex = 882;
+            this.lblHot.Text = "爆品：";
+            this.lblHot.Visible = false;
             // 
             // btnSearch
             // 
@@ -369,7 +358,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(1090, 5);
+            this.btnSearch.Location = new System.Drawing.Point(1091, 5);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(46, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -393,7 +382,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmpty.Location = new System.Drawing.Point(1142, 5);
+            this.btnEmpty.Location = new System.Drawing.Point(1143, 5);
             this.btnEmpty.Name = "btnEmpty";
             this.btnEmpty.Size = new System.Drawing.Size(46, 25);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -420,10 +409,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat3.DropDownWidth = 1;
             this.cmbCat3.FormattingEnabled = true;
             this.cmbCat3.IntegralHeight = false;
-            this.cmbCat3.Location = new System.Drawing.Point(718, 5);
+            this.cmbCat3.Location = new System.Drawing.Point(733, 5);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(146, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(151, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.Text = "全部";
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged);
@@ -433,7 +422,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(667, 9);
+            this.label17.Location = new System.Drawing.Point(682, 9);
             this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(51, 17);
@@ -448,10 +437,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat2.DropDownWidth = 1;
             this.cmbCat2.FormattingEnabled = true;
             this.cmbCat2.IntegralHeight = false;
-            this.cmbCat2.Location = new System.Drawing.Point(515, 5);
+            this.cmbCat2.Location = new System.Drawing.Point(525, 5);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(146, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(151, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.Text = "全部";
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged);
@@ -461,7 +450,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(464, 9);
+            this.label14.Location = new System.Drawing.Point(474, 9);
             this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(51, 17);
@@ -476,10 +465,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat1.DropDownWidth = 1;
             this.cmbCat1.FormattingEnabled = true;
             this.cmbCat1.IntegralHeight = false;
-            this.cmbCat1.Location = new System.Drawing.Point(293, 7);
+            this.cmbCat1.Location = new System.Drawing.Point(298, 7);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(146, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(151, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.Text = "全部";
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged);
@@ -489,7 +478,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(242, 9);
+            this.label2.Location = new System.Drawing.Point(247, 9);
             this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(51, 17);
@@ -502,7 +491,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtProdName.Location = new System.Drawing.Point(71, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(146, 23);
+            this.txtProdName.Size = new System.Drawing.Size(151, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // label3
@@ -539,15 +528,84 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbWxSafe.Location = new System.Drawing.Point(71, 42);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(146, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(151, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
+            // chkCatBoundMoreThan
+            // 
+            this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(231, 42);
+            this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan";
+            this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21);
+            this.chkCatBoundMoreThan.TabIndex = 815;
+            this.chkCatBoundMoreThan.Text = "保证金≥";
+            this.chkCatBoundMoreThan.UseVisualStyleBackColor = true;
+            this.chkCatBoundMoreThan.CheckedChanged += new System.EventHandler(this.chkCatBoundMoreThan_CheckedChanged);
+            // 
+            // txtCatBoundMoreThan
+            // 
+            this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(298, 41);
+            this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan";
+            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(151, 23);
+            this.txtCatBoundMoreThan.TabIndex = 882;
+            this.txtCatBoundMoreThan.Text = "1000";
+            this.txtCatBoundMoreThan.Visible = false;
+            // 
+            // chkCatBoundLessThan
+            // 
+            this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.chkCatBoundLessThan.Location = new System.Drawing.Point(458, 42);
+            this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.chkCatBoundLessThan.Name = "chkCatBoundLessThan";
+            this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21);
+            this.chkCatBoundLessThan.TabIndex = 882;
+            this.chkCatBoundLessThan.Text = "保证金≤";
+            this.chkCatBoundLessThan.UseVisualStyleBackColor = true;
+            this.chkCatBoundLessThan.CheckedChanged += new System.EventHandler(this.chkCatBoundLessThan_CheckedChanged);
+            // 
+            // txtCatBoundLessThan
+            // 
+            this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtCatBoundLessThan.Location = new System.Drawing.Point(525, 41);
+            this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.txtCatBoundLessThan.Name = "txtCatBoundLessThan";
+            this.txtCatBoundLessThan.Size = new System.Drawing.Size(151, 23);
+            this.txtCatBoundLessThan.TabIndex = 883;
+            this.txtCatBoundLessThan.Text = "100000";
+            this.txtCatBoundLessThan.Visible = false;
+            // 
+            // cmbGroupFilter
+            // 
+            this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbGroupFilter.FormattingEnabled = true;
+            this.cmbGroupFilter.Location = new System.Drawing.Point(934, 40);
+            this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbGroupFilter.Name = "cmbGroupFilter";
+            this.cmbGroupFilter.Size = new System.Drawing.Size(151, 25);
+            this.cmbGroupFilter.TabIndex = 653;
+            this.cmbGroupFilter.Visible = false;
+            // 
+            // lblSourceType
+            // 
+            this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.lblSourceType.AutoSize = true;
+            this.lblSourceType.Location = new System.Drawing.Point(689, 44);
+            this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.lblSourceType.Name = "lblSourceType";
+            this.lblSourceType.Size = new System.Drawing.Size(44, 17);
+            this.lblSourceType.TabIndex = 651;
+            this.lblSourceType.Text = "来源：";
+            this.lblSourceType.Visible = false;
+            // 
             // lblGroup
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(894, 9);
+            this.lblGroup.Location = new System.Drawing.Point(890, 44);
             this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblGroup.Name = "lblGroup";
             this.lblGroup.Size = new System.Drawing.Size(44, 17);
@@ -555,17 +613,6 @@ namespace TemuKJD.WXForms.ProductForms
             this.lblGroup.Text = "分组：";
             this.lblGroup.Visible = false;
             // 
-            // cmbGroupFilter
-            // 
-            this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(938, 5);
-            this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25);
-            this.cmbGroupFilter.TabIndex = 653;
-            this.cmbGroupFilter.Visible = false;
-            // 
             // cmbSourceType
             // 
             this.cmbSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -580,42 +627,28 @@ namespace TemuKJD.WXForms.ProductForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(718, 40);
+            this.cmbSourceType.Location = new System.Drawing.Point(733, 40);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(146, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(151, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.Text = "厂商直采";
             this.cmbSourceType.Visible = false;
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             // 
-            // lblSourceType
+            // lblSetShop
             // 
-            this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(674, 44);
-            this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-            this.lblSourceType.Name = "lblSourceType";
-            this.lblSourceType.Size = new System.Drawing.Size(44, 17);
-            this.lblSourceType.TabIndex = 651;
-            this.lblSourceType.Text = "来源：";
-            this.lblSourceType.Visible = false;
-            // 
-            // cmbRelation
-            // 
-            this.cmbRelation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbRelation.FormattingEnabled = true;
-            this.cmbRelation.Items.AddRange(new object[] {
-            "",
-            "是",
-            "否"});
-            this.cmbRelation.Location = new System.Drawing.Point(938, 40);
-            this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.cmbRelation.Name = "cmbRelation";
-            this.cmbRelation.Size = new System.Drawing.Size(146, 25);
-            this.cmbRelation.TabIndex = 882;
-            this.cmbRelation.Visible = false;
+            this.lblSetShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.lblSetShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblSetShop.ForeColor = System.Drawing.Color.DarkOrange;
+            this.lblSetShop.Location = new System.Drawing.Point(1206, 31);
+            this.lblSetShop.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.lblSetShop.Name = "lblSetShop";
+            this.lblSetShop.Size = new System.Drawing.Size(214, 17);
+            this.lblSetShop.TabIndex = 718;
+            this.lblSetShop.Text = "指定店铺：";
+            this.lblSetShop.TextAlign = System.Drawing.ContentAlignment.TopRight;
             // 
             // splitContainer2
             // 
@@ -1588,6 +1621,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.PDDDBProdListForm_KeyUp);
             this.Controls.SetChildIndex(this.splitContainer1, 0);
             this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
             this.splitContainer1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
@@ -1714,5 +1748,7 @@ namespace TemuKJD.WXForms.ProductForms
         public System.Windows.Forms.ComboBox cmbSourceType;
         public System.Windows.Forms.ComboBox cmbRelation;
         public System.Windows.Forms.Label lblRelation;
+        private System.Windows.Forms.Label lblHot;
+        private System.Windows.Forms.ComboBox cmbHot;
     }
 }

TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs

@@ -60,8 +60,6 @@ namespace TemuKJD.WXForms.ProductForms
                 chkCatBoundMoreThan.Visible = false;
                 lblWxSafe.Visible = false;
                 cmbWxSafe.Visible = false;
-                tableLayoutPanel1.SetColumn(lblSourceType, 0);
-                tableLayoutPanel1.SetColumn(cmbSourceType, 1); 
                 dgvDbProduct.Columns["colCatBound"].Visible = false;
                 dgvDbProduct.Columns["colWxSafe"].Visible = false;
                 dgvDbProduct.Columns["colMainImg"].FillWeight = 25;
@@ -69,7 +67,11 @@ namespace TemuKJD.WXForms.ProductForms
 
             Task.Run(() =>
             {
-                PDDDBProdListForm.GetPDDProductGroup(new List<ComboBox> { cmbGroupFilter, }, "", "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin");
+                // 同时刷新下商品分组
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                PDDDBProdListForm.GetPDDProductGroup(new List<ComboBox> { cmbGroupFilter, }, "", "", addUserName);
                 GetPddProductCate();
             });
             if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态
@@ -120,12 +122,58 @@ namespace TemuKJD.WXForms.ProductForms
                 cmbSourceType.Visible = true;
                 lblGroup.Visible = true;
                 cmbGroupFilter.Visible = true;
-                tableLayoutPanel1.ColumnStyles[9].SizeType = SizeType.Percent;
-                tableLayoutPanel1.ColumnStyles[9].Width = 20;
             }
-            else
+            if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("爆款数据"))
             {
-                tableLayoutPanel1.ColumnStyles[9].SizeType = SizeType.AutoSize;
+                lblHot.Visible = true;
+                cmbHot.Visible = true;
+            }
+
+            var ctrls = tableLayoutPanel1.Controls.Cast<Control>().ToList();
+            List<Control> ctrlLst = new List<Control>();
+            for (int j = 0; j < 2; j++)
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    var ctrl = ctrls.FirstOrDefault(c => tableLayoutPanel1.GetRow(c) == j && tableLayoutPanel1.GetColumn(c) == i);
+                    // tableLayoutPanel1.GetControlFromPosition(i, j); 取不到隐藏的商品
+                    if (ctrl != null)
+                        ctrlLst.Add(ctrl);
+                    else
+                    {
+                    }
+                }
+            }
+
+            for (int i = 0; i < ctrlLst.Count - 1; i++)
+            {
+                var ctrl = ctrlLst[i];
+                var row = tableLayoutPanel1.GetRow(ctrl);
+                var column = tableLayoutPanel1.GetColumn(ctrl);
+
+                if (ctrl.Visible == false && ctrl.Name != "txtCatBoundMoreThan" && ctrl.Name != "txtCatBoundLessThan")
+                {
+                    tableLayoutPanel1.SetRow(ctrlLst[i + 1], row);
+                    tableLayoutPanel1.SetColumn(ctrlLst[i + 1], column);
+                }
+                else if (column < 9)
+                {
+                    tableLayoutPanel1.SetRow(ctrlLst[i + 1], row);
+                    tableLayoutPanel1.SetColumn(ctrlLst[i + 1], column + 1);
+                }
+                else if (column >= 9)
+                {
+                    tableLayoutPanel1.SetRow(ctrlLst[i + 1], row + 1);
+                    tableLayoutPanel1.SetColumn(ctrlLst[i + 1], 0);
+                }
+            }
+
+            for (int i = 0; i < 10; i++)
+            {
+                if (tableLayoutPanel1.GetControlFromPosition(i, 0) == null && tableLayoutPanel1.GetControlFromPosition(i, 1) == null)// 取不到隐藏的商品
+                {
+                    tableLayoutPanel1.ColumnStyles[i].SizeType = SizeType.AutoSize;
+                }
             }
         }
 
@@ -341,7 +389,13 @@ namespace TemuKJD.WXForms.ProductForms
                     "&search_group=" + cmbGroupFilter.Text.Trim() +
                     "&search_prod_name=" + txtProdName.Text.Trim() +
                     "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验").Replace("违规商品", "");
-                data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin");
+
+                // 同时刷新下商品分组
+                string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
+                if (BaseClass.GroupId != 3)
+                    addUserName = BaseClass.ParentAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.ParentUserName) : "admin";
+                data += "&add_user_name=" + addUserName;
+
                 if (BaseClass.MainPath == "weixin")
                     data += "&ban_wx=0";
                 if (BaseClass.MainPath == "binxixi")
@@ -437,6 +491,9 @@ namespace TemuKJD.WXForms.ProductForms
                 }
                 if (chkWXComplateProd.Checked)
                     data += "&has_wx_format=1";
+
+                if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim()))
+                    data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍");
             }));
             var html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -507,6 +564,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbWxCat.Text = "是";
             this.cmbExportToOutServer.Text = "是";
             this.txtSecretStyleCode.Text = "";
+            this.cmbHot.Text = "普通商品";
         }
 
         private void cmbCat1_SelectedIndexChanged(object sender, EventArgs e)
@@ -1032,5 +1090,21 @@ namespace TemuKJD.WXForms.ProductForms
         {
 
         }
+
+        private void cmbHot_TextChanged(object sender, EventArgs e)
+        {
+            if (cmbHot.Text == "爆款数据")
+            {
+                cmbSourceType.Text = "";
+                cmbExportToOutServer.Text = "";
+                cmbWxCat.Text = "";
+            }
+            else
+            {
+                cmbSourceType.Text = "厂商直采";
+                cmbExportToOutServer.Text = "是";
+                cmbWxCat.Text = "是";
+            }
+        }
     }
 }

TEMUKJD/WXForms/ShopForms/WXShopAddEditForm.cs

@@ -59,8 +59,12 @@ namespace TemuKJD.WXForms.ShopForms
             if (chkShopGroup.Checked)
                 shop.GroupName = this.cmbGroup.Text;
             if (chkSubAccount.Checked)
+            {
+                if (shopSubAccountTmp == null)
+                    shopSubAccountTmp = JsonHelper.DeserializeJsonToObject<ShopLoginInfo>(JsonHelper.SerializeObject(shop));
                 shop.SubUserName = shopSubAccountTmp.SubUserName;
-
+            }
+            
             shop.CompanyName = AllBase.BaseClass.CompanyName;
 
             foreach (var sp in lstShopLoginInfo)

TEMUKJD/WXForms/ShopForms/WXShopBrowserObject.cs

@@ -26,9 +26,12 @@ namespace TemuKJD.WXForms.ShopForms
     public class WXShopBrowserObject
     {
         public delegate void InfoReceivedHandler(string information);
+        /// <summary>
+        /// 通知前端事件 
+        /// </summary>
         public event InfoReceivedHandler OnInfoReceived;
 
-        public string getProduct(string sProdId, string supplierId, bool isReGet = true, bool notSaveDb = false)
+        public string getProduct(string sProdId, string supplierId, bool isReGet = true)
         {
             var prodId = sProdId.ParseToLong();
             if (prodId <= 0)
@@ -54,7 +57,11 @@ namespace TemuKJD.WXForms.ShopForms
 
             Task.Run(() =>
             {
-                var msg = reGetProductWidthWXFormat(shop, sProdId, isReGet);
+                string msg = "";
+                if (isReGet)
+                    msg = ReGetProductWithWXFormat(shop, sProdId);
+                else
+                    msg = GetWxProduct(shop, sProdId);
                 if (!string.IsNullOrEmpty(msg))
                 {
                     if (!msg.StartsWith("success") && !msg.StartsWith("商品回采保存成功") && !msg.Contains("微信商品采集入库成功"))
@@ -77,9 +84,9 @@ namespace TemuKJD.WXForms.ShopForms
             return "success";
         }
 
-        public string reGetProductWidthWXFormat(ShopLoginInfo shop, string prodId, bool isReGet = true)
+        public string ReGetProductWithWXFormat(ShopLoginInfo shop, string prodId)
         {
-            string getString = isReGet ? "商品回采" : "商品采集";
+            //string getString = isReGet ? "商品回采" : "商品采集";
             try
             {
                 Thread.Sleep(Randomx.GetId(10, 50));
@@ -100,13 +107,13 @@ namespace TemuKJD.WXForms.ShopForms
                         if (shop.LoginStatus != "登录成功")
                             errmsg = "店铺掉线";
 
-                        return getString + "失败！" + errmsg;
+                        return "商品回采失败！" + errmsg;
                     }
                 }
                 catch (Exception ex)
                 {
-                    //OnInfoReceived("商品获取失败！商品数据格式获取失败！" + ex.Message);
-                    return getString + "失败！商品数据格式获取失败！" + ex.Message;
+                    //OnInfoReceived("商品回采失败！商品数据格式获取失败！" + ex.Message);
+                    return "商品回采失败！商品数据格式获取失败！" + ex.Message;
                 }
 
                 WXGetEditProductInfoLite wxProdInfoLite = null;
@@ -126,32 +133,24 @@ namespace TemuKJD.WXForms.ShopForms
                         if (shop.LoginStatus != "登录成功")
                             errmsg = "店铺掉线";
 
-                        return getString + "失败！" + errmsg;
+                        return "商品回采失败！" + errmsg;
                     }
                     var addressStr = JsonHelper.JObjectParse(addressRst)["addressList"].FirstOrDefault().ParseToString();
                     wxProdInfoLite.address = JsonHelper.DeserializeJsonToObject<WXAfterSaleAddressInfo>(addressStr);
-                    if (isReGet && wxProdInfoLite.address == null)
-                        return getString + "失败！商品详情获取失败";
+                    if (wxProdInfoLite.address == null)
+                        return "商品回采失败！商品详情获取失败";
                     // 查看下json结构
                     var wxProdInfoLiteStr = JsonHelper.SerializeObject(wxProdInfoLite);
                     if (string.IsNullOrWhiteSpace(wxProdInfoLite.product.info.spuCode))
                     {
-                        if (isReGet)
-                        {
-                            return getString + "失败：外部编码采集失败，跳过";
-                        }
-                        else
-                        {
-                            return SaveWxProd(shop, prodId, wxProdInfoLite);
-                        }
+                        return "商品回采失败：未找到外部编码，采集失败，跳过";
                     }
                 }
                 catch (Exception ex)
                 {
-                    return getString + "失败：格式转换失败 " + ex.Message;
+                    return "商品回采失败：格式转换失败 " + ex.Message;
                 }
 
-
                 // 查询商品库有没有
                 var url = BaseClass.BuildPDDObjString("product/get_product_spu_id_list");
                 Thread.Sleep(200);
@@ -166,12 +165,12 @@ namespace TemuKJD.WXForms.ShopForms
                     var errMsg = BaseRegex.GetStringJson(ref result, "msg");
                     if (string.IsNullOrEmpty(errMsg))
                         errMsg = result;
-                    return getString + "查询商品错误：" + errMsg;
+                    return "商品回采查询商品错误：" + errMsg;
                 }
                 List<KJDDBProduct> complateDbProdExistLst = JsonHelper.DeserializeJsonToList<KJDDBProduct>(JsonHelper.JObjectParse(result)["data"].ParseToString());
                 if (complateDbProdExistLst.Count == 0)
                 {
-                    return getString + "商品不存在";
+                    return "回采商品不存在";
                 }
 
                 url = BaseClass.BuildPDDObjString("product/add_prod_wx_complate");
@@ -190,20 +189,109 @@ namespace TemuKJD.WXForms.ShopForms
                     var errMsg = BaseRegex.GetStringJson(ref result, "msg");
                     if (string.IsNullOrEmpty(errMsg))
                         errMsg = result;
-                    return getString + "查询商品错误：" + errMsg;
+                    return "商品回采查询商品错误：" + errMsg;
                 }
                 else
                 {
-                    return getString + "保存成功！";
+                    return "商品回采保存成功！";
                 }
             }
             catch (Exception ex)
             {
-                return getString + "失败!" + ex.Message;
+                return "商品回采失败!" + ex.Message;
             }
         }
 
-        string SaveWxProd(ShopLoginInfo shop, string prodId, WXGetEditProductInfoLite wxEditProdInfoLite)
+        public string GetWxProduct(ShopLoginInfo shop, string prodId)
+        {
+            WXGetEditProductInfoLite wxProdInfoLite = null;
+            return GetWxProduct(shop, prodId, ref wxProdInfoLite);
+        }
+
+        public string GetWxProduct(ShopLoginInfo shop, string prodId, ref WXGetEditProductInfoLite wxProdInfoLite, bool isNotSaveDB = false)
+        {
+            try
+            {
+                Thread.Sleep(Randomx.GetId(10, 50));
+                string getEditProdRst = "";
+                try
+                {
+                    getEditProdRst = WXUpload.getEditProductV2(shop, prodId);
+                    Thread.Sleep(Randomx.GetId(50, 100));
+                    if (getEditProdRst.Contains("biz magic invalid"))
+                    {
+                        WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                    }
+                    if (!getEditProdRst.Contains("\"success\":true"))
+                    {
+                        var errmsg = BaseRegex.GetStringJson(ref getEditProdRst, "msg");
+                        if (string.IsNullOrWhiteSpace(errmsg))
+                            errmsg = getEditProdRst;
+                        if (shop.LoginStatus != "登录成功")
+                            errmsg = "店铺掉线";
+
+                        return "店铺商品采集失败！" + errmsg;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    //OnInfoReceived("商品获取失败！商品数据格式获取失败！" + ex.Message);
+                    return "店铺商品采集失败！商品数据格式获取失败！" + ex.Message;
+                }
+
+                try
+                {
+                    wxProdInfoLite = JsonHelper.DeserializeJsonToObject<WXGetEditProductInfoLite>(getEditProdRst);
+                    var addressRst = WXUpload.getAddressById(shop, wxProdInfoLite.product.info.afterSaleInfo.afterSaleAddressId);
+                    if (addressRst.Contains("biz magic invalid"))
+                    {
+                        WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                    }
+                    if (!addressRst.Contains("\"success\":true"))
+                    {
+                        var errmsg = BaseRegex.GetStringJson(ref addressRst, "msg");
+                        if (string.IsNullOrWhiteSpace(errmsg))
+                            errmsg = addressRst;
+                        if (shop.LoginStatus != "登录成功")
+                            errmsg = "店铺掉线";
+
+                        return "店铺商品采集失败！" + errmsg;
+                    }
+                    var addressStr = JsonHelper.JObjectParse(addressRst)["addressList"].FirstOrDefault().ParseToString();
+                    wxProdInfoLite.address = JsonHelper.DeserializeJsonToObject<WXAfterSaleAddressInfo>(addressStr);
+                    if (wxProdInfoLite.address == null)
+                        return "店铺商品采集失败！商品详情获取失败";
+                    // 查看下json结构
+                    var wxProdInfoLiteStr = JsonHelper.SerializeObject(wxProdInfoLite);
+
+                    if (isNotSaveDB)
+                        return "success";
+                    else
+                        return SaveWxProd(shop, prodId, wxProdInfoLite);
+                }
+                catch (Exception ex)
+                {
+                    return "店铺商品采集失败：格式转换失败 " + ex.Message;
+                }
+            }
+            catch (Exception ex)
+            {
+                return "失败!" + ex.Message;
+            }
+        }
+
+        /// <summary>
+        /// 店采商品保存
+        /// </summary>
+        /// <param name="shop"></param>
+        /// <param name="prodId"></param>
+        /// <param name="wxEditProdInfoLite"></param>
+        /// <param name="specialProdType"></param>
+        /// <param name="coid"></param>
+        /// <param name="realCoid"></param>
+        /// <returns></returns>
+        public string SaveWxProd(ShopLoginInfo shop, string prodId, WXGetEditProductInfoLite wxEditProdInfoLite, 
+            string specialProdType = null, string coid = null, string realCoid = null, int? viewUv = null, string wx_safe_status = "安全商品")
         {
             bool isExist = false;
             var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list");
@@ -231,18 +319,27 @@ namespace TemuKJD.WXForms.ShopForms
             var data = Work.UserLogin.GetSignaturex() +
                 "&from_shop_id=" + shop.ShopId +
                 "&from_shop_name=" + shop.ShopAccount +
-                "&spu_id=" + prodId +
-                "&skc_id=" + prodId +
-                "&price_text=" + skus.Min(s => s.productSkuInfo.salePrice * 0.01m) + " - " + skus.Max(s => s.productSkuInfo.salePrice * 0.01m) +
-                "&ext_code=" + "" +
-                "&product_name=" + HttpUtility.UrlEncode(wxEditProdInfoLite.product.info.title, Encoding.UTF8) +
-                "&product_json=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(wxEditProdInfoLite), Encoding.UTF8) +
-                "&size_json=" + HttpUtility.UrlEncode("{}", Encoding.UTF8) +
-                "&sale_count=" +
-                "&sale_count_text=" + 
-                "&main_img=" + HttpUtility.UrlEncode(wxEditProdInfoLite.product.info.headImg.FirstOrDefault(), Encoding.UTF8) +
-                "&wx_safe_status=" + HttpUtility.UrlEncode("安全商品", Encoding.UTF8) +
-                "&product_get_type=" + HttpUtility.UrlEncode("微信店采", Encoding.UTF8);
+                "&spu_id=" + prodId;
+            if (specialProdType == "爆款数据")
+                data += "&add_hot_version=v3";
+            if (!string.IsNullOrWhiteSpace(coid))
+                data += "&skc_id=" + coid;
+            else
+                data += "&skc_id=" + prodId;
+            if (!string.IsNullOrWhiteSpace(realCoid))
+            {
+                data += "&real_coid=" + realCoid;
+            }
+            data += "&price_text=" + skus.Min(s => s.productSkuInfo.salePrice * 0.01m) + " - " + skus.Max(s => s.productSkuInfo.salePrice * 0.01m);
+            data += "&ext_code=" + wxEditProdInfoLite.product.info.spuCode;
+            data += "&product_name=" + HttpUtility.UrlEncode(wxEditProdInfoLite.product.info.title, Encoding.UTF8) +
+            "&product_json=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(wxEditProdInfoLite), Encoding.UTF8) +
+            "&size_json=" + HttpUtility.UrlEncode("{}", Encoding.UTF8) +
+            "&sale_count=" +
+            "&sale_count_text=" + 
+            "&main_img=" + HttpUtility.UrlEncode(wxEditProdInfoLite.product.info.headImg.FirstOrDefault(), Encoding.UTF8) +
+            "&wx_safe_status=" + HttpUtility.UrlEncode(wx_safe_status, Encoding.UTF8) +
+            "&product_get_type=" + HttpUtility.UrlEncode("微信店采", Encoding.UTF8);
 
             if (wxEditProdInfoLite.product.info.category.Count > 0)
             {
@@ -254,9 +351,17 @@ namespace TemuKJD.WXForms.ShopForms
                 data += "&cat_id=" + wxEditProdInfoLite.product.info.category.LastOrDefault()?.catId;
                 data += "&cat_name=" + HttpUtility.UrlEncode((wxEditProdInfoLite.product.info.category.LastOrDefault()?.name).ParseToString(), Encoding.UTF8);
             }
-            if (wxEditProdInfoLite.product.info.category.FirstOrDefault().name == "图书")
+            //if (wxEditProdInfoLite.product.info.category.FirstOrDefault().name == "图书")
+            //{
+            //    data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8);
+            //}
+            if (specialProdType != null)
             {
-                data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8);
+                data += "&special_prod_type=" + HttpUtility.UrlEncode("爆款数据", Encoding.UTF8);
+            }
+            if (viewUv != null)
+            {
+                data += "&view_uv=" + viewUv;
             }
 
             html = GetHtml.PostUtf8(url, data);
@@ -264,7 +369,7 @@ namespace TemuKJD.WXForms.ShopForms
                 html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
             {
-                string msg = "商品入库失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
+                string msg = "商品入库失败！请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
                 //Invoke(new Action(() =>
                 //{
                 //    row.Cells["colMsg"].Value = msg;
@@ -286,12 +391,12 @@ namespace TemuKJD.WXForms.ShopForms
                         html = GetHtml.PostUtf8(url, data);
                     if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
                     {
-                        string msg = "商品入库失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
+                        string msg = "商品入库失败！请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
                         return msg;
                     }
                 }
 
-                return "微信商品采集入库成功!";
+                return "微信商品采集入库成功！";
             }
         }
     }

TEMUKJD/WXForms/ShopForms/WXShopMultiLoginForm.cs

@@ -363,21 +363,23 @@ namespace TemuKJD.WXForms.ShopForms
 
                     string jsStr1 = @"document.getElementsByClassName('shop-info-popover')[0].style ='';
                     var divLst = document.getElementsByClassName('shop-info-popover')[0].getElementsByTagName('div');
-                    for (i=0; i<divLst.length; i++){
+                    (function() {  for (i=0; i<divLst.length; i++){
                         if(divLst[i].innerHTML.indexOf('切换店铺') >= 0){
                             divLst[i].click();
-                            //return 'success'
+                            //return 'success';
                         }
-                    }";
+                    }  })();";
                     var t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr1);
                     t1.Wait(5000);
 
                     Thread.Sleep(Randomx.GetId(500, 1000));
-                    jsStr1 = @"for (i=0; i<divLst.length; i++){
-                        if(divLst[i].innerHTML.indexOf('" + switchInfo.nickname + @"') >= 0){
+                    jsStr1 = @"(function() {  for (i=0; i<divLst.length; i++){
+                        //if(divLst[i].innerHTML.indexOf('" + switchInfo.nickname + @"') >= 0){
+                        if(divLst[i].innerHTML == '" + switchInfo.nickname + @"'){
                             divLst[i].click();
+                            return 'success';
                         }
-                    }";
+                    }  })();";
                     t1 = cefWebBrowser.GetMainFrame().EvaluateScriptAsync(jsStr1);
                     t1.Wait(5000);
 

TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs

@@ -56,8 +56,6 @@ namespace TemuKJD.WXForms.ShopForms
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -68,6 +66,8 @@ namespace TemuKJD.WXForms.ShopForms
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -123,6 +123,14 @@ namespace TemuKJD.WXForms.ShopForms
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pnlUpdateRemark = new System.Windows.Forms.Panel();
+            this.lblShopId = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.txtRemark = new System.Windows.Forms.TextBox();
+            this.btnRemarkCancel = new DevComponents.DotNetBar.PanelEx();
+            this.btnRemarkOK = new DevComponents.DotNetBar.PanelEx();
+            this.lblOrderId = new System.Windows.Forms.Label();
+            this.lblShopName = new System.Windows.Forms.Label();
             this.dgvData1 = new TemuKJD.UserComponent.DataGridViewEx();
             this.colDgv1Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colDgv1ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -141,6 +149,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv1AfterSaleReason = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv1OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv1Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colDgv1Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage2 = new System.Windows.Forms.TabPage();
             this.panel2 = new System.Windows.Forms.Panel();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
@@ -165,18 +174,11 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv2CommentContent = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv2OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv2Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colDgv2Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tabPage3 = new System.Windows.Forms.TabPage();
             this.mainPanel = new System.Windows.Forms.Panel();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
             this.dgvData3 = new TemuKJD.UserComponent.DataGridViewEx();
-            this.tabPage4 = new System.Windows.Forms.TabPage();
-            this.panel3 = new System.Windows.Forms.Panel();
-            this.pictureBox4 = new System.Windows.Forms.PictureBox();
-            this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx();
-            this.tabPage5 = new System.Windows.Forms.TabPage();
-            this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components);
-            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
             this.colDgv3Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colDgv3ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv3ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -198,6 +200,11 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv3WaybillId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colDgv3Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.dgvData4 = new TemuKJD.UserComponent.DataGridViewEx();
             this.colDgv4Check = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colDgv4ShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv4ShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -219,6 +226,12 @@ namespace TemuKJD.WXForms.ShopForms
             this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv4OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colDgv4Remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tabPage5 = new System.Windows.Forms.TabPage();
+            this.chkTestNoAuditUpload = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.label2 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -235,6 +248,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.tabPage1.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.pnlUpdateRemark.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvData1)).BeginInit();
             this.tabPage2.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -935,6 +949,7 @@ namespace TemuKJD.WXForms.ShopForms
             // panel1
             // 
             this.panel1.Controls.Add(this.pictureBox1);
+            this.panel1.Controls.Add(this.pnlUpdateRemark);
             this.panel1.Controls.Add(this.dgvData1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -955,6 +970,117 @@ namespace TemuKJD.WXForms.ShopForms
             this.pictureBox1.TabStop = false;
             this.pictureBox1.Visible = false;
             // 
+            // pnlUpdateRemark
+            // 
+            this.pnlUpdateRemark.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.pnlUpdateRemark.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pnlUpdateRemark.Controls.Add(this.lblShopId);
+            this.pnlUpdateRemark.Controls.Add(this.label1);
+            this.pnlUpdateRemark.Controls.Add(this.txtRemark);
+            this.pnlUpdateRemark.Controls.Add(this.btnRemarkCancel);
+            this.pnlUpdateRemark.Controls.Add(this.btnRemarkOK);
+            this.pnlUpdateRemark.Controls.Add(this.lblOrderId);
+            this.pnlUpdateRemark.Controls.Add(this.lblShopName);
+            this.pnlUpdateRemark.Controls.Add(this.label2);
+            this.pnlUpdateRemark.Location = new System.Drawing.Point(467, 63);
+            this.pnlUpdateRemark.Name = "pnlUpdateRemark";
+            this.pnlUpdateRemark.Size = new System.Drawing.Size(474, 146);
+            this.pnlUpdateRemark.TabIndex = 781;
+            this.pnlUpdateRemark.Visible = false;
+            // 
+            // lblShopId
+            // 
+            this.lblShopId.AutoSize = true;
+            this.lblShopId.Location = new System.Drawing.Point(20, 112);
+            this.lblShopId.Name = "lblShopId";
+            this.lblShopId.Size = new System.Drawing.Size(50, 17);
+            this.lblShopId.TabIndex = 475;
+            this.lblShopId.Text = "ShopId";
+            this.lblShopId.Visible = false;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(20, 52);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 17);
+            this.label1.TabIndex = 468;
+            this.label1.Text = "备注";
+            // 
+            // txtRemark
+            // 
+            this.txtRemark.Location = new System.Drawing.Point(55, 48);
+            this.txtRemark.Multiline = true;
+            this.txtRemark.Name = "txtRemark";
+            this.txtRemark.Size = new System.Drawing.Size(407, 54);
+            this.txtRemark.TabIndex = 467;
+            // 
+            // btnRemarkCancel
+            // 
+            this.btnRemarkCancel.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnRemarkCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnRemarkCancel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnRemarkCancel.Location = new System.Drawing.Point(406, 112);
+            this.btnRemarkCancel.Name = "btnRemarkCancel";
+            this.btnRemarkCancel.Size = new System.Drawing.Size(56, 24);
+            this.btnRemarkCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRemarkCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnRemarkCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnRemarkCancel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnRemarkCancel.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRemarkCancel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnRemarkCancel.Style.GradientAngle = 90;
+            this.btnRemarkCancel.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRemarkCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRemarkCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRemarkCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRemarkCancel.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnRemarkCancel.TabIndex = 466;
+            this.btnRemarkCancel.Text = "取消";
+            this.btnRemarkCancel.Click += new System.EventHandler(this.btnRemarkCancel_Click);
+            // 
+            // btnRemarkOK
+            // 
+            this.btnRemarkOK.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnRemarkOK.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnRemarkOK.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnRemarkOK.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnRemarkOK.Location = new System.Drawing.Point(347, 112);
+            this.btnRemarkOK.Name = "btnRemarkOK";
+            this.btnRemarkOK.Size = new System.Drawing.Size(56, 24);
+            this.btnRemarkOK.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRemarkOK.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRemarkOK.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRemarkOK.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnRemarkOK.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnRemarkOK.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnRemarkOK.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnRemarkOK.Style.GradientAngle = 90;
+            this.btnRemarkOK.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRemarkOK.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRemarkOK.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRemarkOK.TabIndex = 465;
+            this.btnRemarkOK.Text = "确定";
+            this.btnRemarkOK.Click += new System.EventHandler(this.btnRemarkOK_Click);
+            // 
+            // lblOrderId
+            // 
+            this.lblOrderId.AutoSize = true;
+            this.lblOrderId.Location = new System.Drawing.Point(255, 19);
+            this.lblOrderId.Name = "lblOrderId";
+            this.lblOrderId.Size = new System.Drawing.Size(55, 17);
+            this.lblOrderId.TabIndex = 456;
+            this.lblOrderId.Text = "OrderId";
+            // 
+            // lblShopName
+            // 
+            this.lblShopName.AutoSize = true;
+            this.lblShopName.Location = new System.Drawing.Point(20, 19);
+            this.lblShopName.Name = "lblShopName";
+            this.lblShopName.Size = new System.Drawing.Size(73, 17);
+            this.lblShopName.TabIndex = 455;
+            this.lblShopName.Text = "ShopName";
+            // 
             // dgvData1
             // 
             this.dgvData1.AllowUserToAddRows = false;
@@ -990,7 +1116,8 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv1OrderTime,
             this.colDgv1AfterSaleReason,
             this.colDgv1OptimizeStatus,
-            this.colDgv1Optimize});
+            this.colDgv1Optimize,
+            this.colDgv1Remark});
             this.dgvData1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvData1.Location = new System.Drawing.Point(0, 0);
             this.dgvData1.MultiSelectCheckBox = true;
@@ -1145,6 +1272,12 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv1Optimize.ReadOnly = true;
             this.colDgv1Optimize.Width = 50;
             // 
+            // colDgv1Remark
+            // 
+            this.colDgv1Remark.HeaderText = "备注";
+            this.colDgv1Remark.Name = "colDgv1Remark";
+            this.colDgv1Remark.ReadOnly = true;
+            // 
             // tabPage2
             // 
             this.tabPage2.Controls.Add(this.panel2);
@@ -1216,7 +1349,8 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv2CommentTime,
             this.colDgv2CommentContent,
             this.colDgv2OptimizeStatus,
-            this.colDgv2Optimize});
+            this.colDgv2Optimize,
+            this.colDgv2Remark});
             this.dgvData2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvData2.Location = new System.Drawing.Point(0, 0);
             this.dgvData2.MultiSelectCheckBox = true;
@@ -1398,6 +1532,12 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv2Optimize.ReadOnly = true;
             this.colDgv2Optimize.Width = 50;
             // 
+            // colDgv2Remark
+            // 
+            this.colDgv2Remark.HeaderText = "备注";
+            this.colDgv2Remark.Name = "colDgv2Remark";
+            this.colDgv2Remark.ReadOnly = true;
+            // 
             // tabPage3
             // 
             this.tabPage3.Controls.Add(this.mainPanel);
@@ -1470,7 +1610,8 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv3DeliveryName,
             this.colDgv3WaybillId,
             this.colDgv3OptimizeStatus,
-            this.colDgv3Optimize});
+            this.colDgv3Optimize,
+            this.colDgv3Remark});
             this.dgvData3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvData3.Location = new System.Drawing.Point(0, 0);
             this.dgvData3.MultiSelectCheckBox = true;
@@ -1481,139 +1622,6 @@ namespace TemuKJD.WXForms.ShopForms
             this.dgvData3.TabIndex = 187;
             this.dgvData3.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
             // 
-            // tabPage4
-            // 
-            this.tabPage4.Controls.Add(this.panel3);
-            this.tabPage4.Location = new System.Drawing.Point(2, 40);
-            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Size = new System.Drawing.Size(1408, 489);
-            this.tabPage4.TabIndex = 2;
-            this.tabPage4.Text = " 配送不达标 ";
-            this.tabPage4.UseVisualStyleBackColor = true;
-            // 
-            // panel3
-            // 
-            this.panel3.Controls.Add(this.pictureBox4);
-            this.panel3.Controls.Add(this.dgvData4);
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panel3.Location = new System.Drawing.Point(0, 0);
-            this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1408, 489);
-            this.panel3.TabIndex = 2;
-            // 
-            // pictureBox4
-            // 
-            this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pictureBox4.Location = new System.Drawing.Point(685, 219);
-            this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(50, 50);
-            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.pictureBox4.TabIndex = 780;
-            this.pictureBox4.TabStop = false;
-            this.pictureBox4.Visible = false;
-            // 
-            // dgvData4
-            // 
-            this.dgvData4.AllowUserToAddRows = false;
-            this.dgvData4.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35;
-            this.dgvData4.AutoRowNumber = true;
-            this.dgvData4.BackgroundColor = System.Drawing.Color.White;
-            this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
-            this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.colDgv4Check,
-            this.colDgv4ShopId,
-            this.colDgv4ShopName,
-            this.colDgv4Login,
-            this.colDgv4InShop,
-            this.colDgv4ImgUrl,
-            this.colDgv4Img,
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn5,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.colDgv4OrderId,
-            this.colDgv4Address,
-            this.colDgv4OrderTime,
-            this.dataGridViewTextBoxColumn9,
-            this.colDgv4WaybillId,
-            this.dataGridViewTextBoxColumn10,
-            this.colDgv4Addresses,
-            this.dataGridViewTextBoxColumn12,
-            this.colDgv4OptimizeStatus,
-            this.colDgv4Optimize});
-            this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvData4.Location = new System.Drawing.Point(0, 0);
-            this.dgvData4.MultiSelectCheckBox = true;
-            this.dgvData4.Name = "dgvData4";
-            this.dgvData4.ReadOnly = true;
-            this.dgvData4.RowTemplate.Height = 23;
-            this.dgvData4.Size = new System.Drawing.Size(1408, 489);
-            this.dgvData4.TabIndex = 187;
-            this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
-            // 
-            // tabPage5
-            // 
-            this.tabPage5.Location = new System.Drawing.Point(2, 40);
-            this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Size = new System.Drawing.Size(1408, 489);
-            this.tabPage5.TabIndex = 3;
-            this.tabPage5.Text = " 物流负向反馈 ";
-            this.tabPage5.UseVisualStyleBackColor = true;
-            // 
-            // chkTestNoAuditUpload
-            // 
-            this.chkTestNoAuditUpload.AutoSize = true;
-            this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35);
-            this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload";
-            this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21);
-            this.chkTestNoAuditUpload.TabIndex = 779;
-            this.chkTestNoAuditUpload.Text = "测试免审提交商品";
-            this.chkTestNoAuditUpload.UseVisualStyleBackColor = true;
-            this.chkTestNoAuditUpload.Visible = false;
-            // 
-            // 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(1772, 27);
-            this.statusBar.TabIndex = 2;
-            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Name = "splitContainer3";
-            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.Controls.Add(this.statusBar);
-            this.splitContainer3.Size = new System.Drawing.Size(1772, 564);
-            this.splitContainer3.SplitterDistance = 533;
-            this.splitContainer3.TabIndex = 3;
-            // 
             // colDgv3Check
             // 
             this.colDgv3Check.Frozen = true;
@@ -1796,6 +1804,96 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv3Optimize.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.colDgv3Optimize.Width = 50;
             // 
+            // colDgv3Remark
+            // 
+            this.colDgv3Remark.HeaderText = "备注";
+            this.colDgv3Remark.Name = "colDgv3Remark";
+            this.colDgv3Remark.ReadOnly = true;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Controls.Add(this.panel3);
+            this.tabPage4.Location = new System.Drawing.Point(2, 40);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Size = new System.Drawing.Size(1408, 489);
+            this.tabPage4.TabIndex = 2;
+            this.tabPage4.Text = " 配送不达标 ";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.pictureBox4);
+            this.panel3.Controls.Add(this.dgvData4);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.panel3.Location = new System.Drawing.Point(0, 0);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(1408, 489);
+            this.panel3.TabIndex = 2;
+            // 
+            // pictureBox4
+            // 
+            this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.pictureBox4.Image = global::TemuKJD.Properties.Resources.loading_blue;
+            this.pictureBox4.Location = new System.Drawing.Point(685, 219);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(50, 50);
+            this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox4.TabIndex = 780;
+            this.pictureBox4.TabStop = false;
+            this.pictureBox4.Visible = false;
+            // 
+            // dgvData4
+            // 
+            this.dgvData4.AllowUserToAddRows = false;
+            this.dgvData4.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35;
+            this.dgvData4.AutoRowNumber = true;
+            this.dgvData4.BackgroundColor = System.Drawing.Color.White;
+            this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
+            this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colDgv4Check,
+            this.colDgv4ShopId,
+            this.colDgv4ShopName,
+            this.colDgv4Login,
+            this.colDgv4InShop,
+            this.colDgv4ImgUrl,
+            this.colDgv4Img,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7,
+            this.colDgv4OrderId,
+            this.colDgv4Address,
+            this.colDgv4OrderTime,
+            this.dataGridViewTextBoxColumn9,
+            this.colDgv4WaybillId,
+            this.dataGridViewTextBoxColumn10,
+            this.colDgv4Addresses,
+            this.dataGridViewTextBoxColumn12,
+            this.colDgv4OptimizeStatus,
+            this.colDgv4Optimize,
+            this.colDgv4Remark});
+            this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvData4.Location = new System.Drawing.Point(0, 0);
+            this.dgvData4.MultiSelectCheckBox = true;
+            this.dgvData4.Name = "dgvData4";
+            this.dgvData4.ReadOnly = true;
+            this.dgvData4.RowTemplate.Height = 23;
+            this.dgvData4.Size = new System.Drawing.Size(1408, 489);
+            this.dgvData4.TabIndex = 187;
+            this.dgvData4.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvData_CellContentClick);
+            // 
             // colDgv4Check
             // 
             this.colDgv4Check.Frozen = true;
@@ -1978,6 +2076,71 @@ namespace TemuKJD.WXForms.ShopForms
             this.colDgv4Optimize.ReadOnly = true;
             this.colDgv4Optimize.Width = 50;
             // 
+            // colDgv4Remark
+            // 
+            this.colDgv4Remark.HeaderText = "备注";
+            this.colDgv4Remark.Name = "colDgv4Remark";
+            this.colDgv4Remark.ReadOnly = true;
+            // 
+            // tabPage5
+            // 
+            this.tabPage5.Location = new System.Drawing.Point(2, 40);
+            this.tabPage5.Name = "tabPage5";
+            this.tabPage5.Size = new System.Drawing.Size(1408, 489);
+            this.tabPage5.TabIndex = 3;
+            this.tabPage5.Text = " 物流负向反馈 ";
+            this.tabPage5.UseVisualStyleBackColor = true;
+            // 
+            // chkTestNoAuditUpload
+            // 
+            this.chkTestNoAuditUpload.AutoSize = true;
+            this.chkTestNoAuditUpload.Location = new System.Drawing.Point(1094, 35);
+            this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload";
+            this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21);
+            this.chkTestNoAuditUpload.TabIndex = 779;
+            this.chkTestNoAuditUpload.Text = "测试免审提交商品";
+            this.chkTestNoAuditUpload.UseVisualStyleBackColor = true;
+            this.chkTestNoAuditUpload.Visible = false;
+            // 
+            // 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(1772, 27);
+            this.statusBar.TabIndex = 2;
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.statusBar);
+            this.splitContainer3.Size = new System.Drawing.Size(1772, 564);
+            this.splitContainer3.SplitterDistance = 533;
+            this.splitContainer3.TabIndex = 3;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(223, 19);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(44, 17);
+            this.label2.TabIndex = 482;
+            this.label2.Text = "单号：";
+            // 
             // WXShopOptimizeForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2009,6 +2172,8 @@ namespace TemuKJD.WXForms.ShopForms
             this.tabPage1.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.pnlUpdateRemark.ResumeLayout(false);
+            this.pnlUpdateRemark.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvData1)).EndInit();
             this.tabPage2.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
@@ -2110,6 +2275,14 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1AfterSaleReason;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OptimizeStatus;
         private System.Windows.Forms.DataGridViewLinkColumn colDgv1Optimize;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Remark;
+        private System.Windows.Forms.Panel pnlUpdateRemark;
+        private System.Windows.Forms.Label lblOrderId;
+        private System.Windows.Forms.Label lblShopName;
+        private DevComponents.DotNetBar.PanelEx btnRemarkCancel;
+        private DevComponents.DotNetBar.PanelEx btnRemarkOK;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtRemark;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv2Check;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopName;
@@ -2130,6 +2303,7 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentContent;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OptimizeStatus;
         private System.Windows.Forms.DataGridViewLinkColumn colDgv2Optimize;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Remark;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv3Check;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopName;
@@ -2151,6 +2325,7 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3WaybillId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OptimizeStatus;
         private System.Windows.Forms.DataGridViewLinkColumn colDgv3Optimize;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Remark;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv4Check;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopName;
@@ -2172,5 +2347,8 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OptimizeStatus;
         private System.Windows.Forms.DataGridViewLinkColumn colDgv4Optimize;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Remark;
+        private System.Windows.Forms.Label lblShopId;
+        private System.Windows.Forms.Label label2;
     }
 }

TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs

@@ -666,7 +666,99 @@ namespace TemuKJD.WXForms.ShopForms
                             }
                         }
                     }
+                    
+                    // 查询是否有失败记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_rst");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", orderAfterSaleInfoLst.Select(w => w.orderInfo.orderId));
+                    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"))
+                    {
+                        foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                        {
+                            if (orderAfterSale.optimizeWaybillId.IsNullOrEmpty())
+                            {
+                                orderAfterSale.optimizeWaybillId = "查询失败";
+                                orderAfterSale.optimizeTime = "";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRstInfo>(sProd);
+                            foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                            {
+                                if (orderAfterSale.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId);
+                                    if (ov != null)
+                                    {
+                                        orderAfterSale.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
+                                        orderAfterSale.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                            {
+                                if (orderAfterSale.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    orderAfterSale.optimizeWaybillId = "查询失败";
+                                    orderAfterSale.optimizeTime = "";
+                                }
+                            }
+                        }
+                    }
 
+                    // 查询备注记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_remark");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", orderAfterSaleInfoLst.Select(w => w.orderInfo.orderId));
+                    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"))
+                    {
+                        foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                        {
+                            orderAfterSale.remark = "备注查询失败";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRemarkInfo>(sProd);
+                            foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderAfterSale.orderInfo.orderId);
+                                orderAfterSale.remark = ov == null ? "" : ov.remark;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var orderAfterSale in orderAfterSaleInfoLst)
+                            {
+                                orderAfterSale.remark = "备注查询失败 " + ex.Message;
+                            }
+                        }
+                    }
+
+                    // 显示列表
                     foreach (var refundOrder in orderAfterSaleInfoLst)
                     {
                         if (CheckOrderExist(refundOrder.orderInfo.orderId))
@@ -693,7 +785,8 @@ namespace TemuKJD.WXForms.ShopForms
                                 BaseClass.StampToDateTime(refundOrder.orderInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
                                 refundOrder.reason,
                                 refundOrder.optimizeWaybillId + "\r\n" + refundOrder.optimizeTime,
-                                "补发"
+                                "补发",
+                                refundOrder.remark.Trim().IsNullOrEmpty() ? "添加备注" : refundOrder.remark.Trim()
                             );
 
                             dgvData1.Rows[rowIndex].Height = 60;
@@ -876,6 +969,98 @@ namespace TemuKJD.WXForms.ShopForms
                         }
                     }
 
+                    // 查询是否有失败记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_rst");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", productEvaluationInfoLst.Select(w => w.order_id));
+                    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"))
+                    {
+                        foreach (var evaluationInfo in productEvaluationInfoLst)
+                        {
+                            if (evaluationInfo.optimizeWaybillId.IsNullOrEmpty())
+                            {
+                                evaluationInfo.optimizeWaybillId = "查询失败";
+                                evaluationInfo.optimizeTime = "";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRstInfo>(sProd);
+                            foreach (var evaluationInfo in productEvaluationInfoLst)
+                            {
+                                if (evaluationInfo.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id);
+                                    if (ov != null)
+                                    {
+                                        evaluationInfo.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
+                                        evaluationInfo.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("yyyy-MM-dd HH:mm");
+                                    }
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var evaluationInfo in productEvaluationInfoLst)
+                            {
+                                if (evaluationInfo.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    evaluationInfo.optimizeWaybillId = "查询失败";
+                                    evaluationInfo.optimizeTime = "";
+                                }
+                            }
+                        }
+                    }
+
+                    // 查询备注记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_remark");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", productEvaluationInfoLst.Select(w => w.order_id));
+                    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"))
+                    {
+                        foreach (var evaluationInfo in productEvaluationInfoLst)
+                        {
+                            evaluationInfo.remark = "备注查询失败";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRemarkInfo>(sProd);
+                            foreach (var evaluationInfo in productEvaluationInfoLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == evaluationInfo.order_id);
+                                evaluationInfo.remark = ov == null ? "" : ov.remark;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var evaluationInfo in productEvaluationInfoLst)
+                            {
+                                evaluationInfo.remark = "备注查询失败 " + ex.Message;
+                            }
+                        }
+                    }
+
+                    //显示列表
                     foreach (var prodEvaluationInfo in productEvaluationInfoLst)
                     {
                         if (CheckOrderExist(prodEvaluationInfo.order_id))
@@ -908,7 +1093,8 @@ namespace TemuKJD.WXForms.ShopForms
                                 BaseClass.StampToDateTime(prodEvaluationInfo.evaluationInfo.firstEvaluationInfo.buyerEvaluationInfo.createTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
                                 (content + " " + (lblLst == null ? "" : string.Join(" ", lblLst.Select(e => e.labelName)))).Trim(),
                                 prodEvaluationInfo.optimizeWaybillId + "\r\n" + prodEvaluationInfo.optimizeTime,
-                                "补发"
+                                "补发",
+                                prodEvaluationInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : prodEvaluationInfo.remark.Trim()
                             );
 
                             dgvData2.Rows[rowIndex].Height = 60;
@@ -1195,6 +1381,44 @@ namespace TemuKJD.WXForms.ShopForms
                         }
                     }
 
+                    // 查询备注记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_remark");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", waybillLst.Select(w => w.orderInfo.orderId));
+                    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"))
+                    {
+                        foreach (var orderWaybill in waybillLst)
+                        {
+                            orderWaybill.remark = "备注查询失败";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRemarkInfo>(sProd);
+                            foreach (var orderWaybill in waybillLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == orderWaybill.orderInfo.orderId);
+                                orderWaybill.remark = ov == null ? "" : ov.remark;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var orderWaybill in waybillLst)
+                            {
+                                orderWaybill.remark = "备注查询失败 " + ex.Message;
+                            }
+                        }
+                    }
+
+                    // 显示列表
                     foreach (var orderWaybill in waybillLst)
                     {
                         if (CheckOrderExist(orderWaybill.orderInfo.orderId))
@@ -1224,7 +1448,8 @@ namespace TemuKJD.WXForms.ShopForms
                                 orderWaybill.delivery.deliveryName,
                                 orderWaybill.waybillId,
                                 orderWaybill.optimizeWaybillId + "\r\n" + orderWaybill.optimizeTime,
-                                "补发"
+                                "补发",
+                                orderWaybill.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderWaybill.remark.Trim()
                             );
 
                         dgvData3.Rows[rowIndex].Height = 60;
@@ -1490,6 +1715,43 @@ namespace TemuKJD.WXForms.ShopForms
                         }
                     }
 
+                    // 查询备注记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_remark");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", optrimizeLinerCgiLst.Select(w => w.order_id));
+                    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"))
+                    {
+                        foreach (var linerCgi in optrimizeLinerCgiLst)
+                        {
+                            linerCgi.remark = "备注查询失败";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRemarkInfo>(sProd);
+                            foreach (var linerCgi in optrimizeLinerCgiLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == linerCgi.order_id);
+                                linerCgi.remark = ov == null ? "" : ov.remark;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var linerCgi in optrimizeLinerCgiLst)
+                            {
+                                linerCgi.remark = "备注查询失败 " + ex.Message; 
+                            }
+                        }
+                    }
+
                     foreach (var orderLinerCgiInfo in optrimizeLinerCgiLst)
                     {
                         if (CheckOrderExist(orderLinerCgiInfo.order_id))
@@ -1520,7 +1782,8 @@ namespace TemuKJD.WXForms.ShopForms
                                 "发货地：" + orderLinerCgiInfo.ship_city + "\r\n" + "收货地：" + orderLinerCgiInfo.ship_province + orderLinerCgiInfo.receipt_city,
                                 (orderLinerCgiInfo.transport_duration.ParseToInt() / 3600) + "小时" + (orderLinerCgiInfo.transport_duration.ParseToInt() % 3600) / 60 + "分" + "\r\n标准时长" + (orderLinerCgiInfo.transport_std_duration.ParseToInt() / 3600) + "小时",
                                 orderLinerCgiInfo.optimizeWaybillId + "\r\n" + orderLinerCgiInfo.optimizeTime,
-                                "补发"
+                                "补发",
+                                orderLinerCgiInfo.remark.Trim().IsNullOrEmpty() ? "添加备注" : orderLinerCgiInfo.remark.Trim()
                             );
 
                             dgvData4.Rows[rowIndex].Height = 60;
@@ -1703,19 +1966,44 @@ namespace TemuKJD.WXForms.ShopForms
                             BaseMsgForm.ShowError("订单编号不符合补发条件！");
                             return;
                         }
-
                         orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
                         if (!string.IsNullOrEmpty(orderId))
-                        {
-                            var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString());
-                            row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst;
-                        }
-                        else
                         {
                             BaseMsgForm.ShowError("缺少订单编号无法补发！");
+                            return;
                         }
+                        var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString());
+                        row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst;
                         break;
                     }
+                case "备注":
+                    {
+                        var orderId = row.Cells[$"colDgv{dgvNum}OrderId"].Value.ParseToString();
+                        if (orderId.Contains("未获取到对应订单号"))
+                        {
+                            BaseMsgForm.ShowError("缺少单编号无法补发！");
+                            return;
+                        }
+                        if (orderId.Contains("获取到多条订单号"))
+                        {
+                            BaseMsgForm.ShowError("订单编号不符合补发条件！");
+                            return;
+                        }
+                        orderId = orderId.Split(new string[] { "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+                        if (string.IsNullOrEmpty(orderId))
+                        {
+                            BaseMsgForm.ShowError("缺少订单编号无法补发！");
+                            return;
+                        }
+                        pnlUpdateRemark.Tag = row.Cells[$"colDgv{dgvNum}Remark"];
+                        lblShopName.Text = shop.ShopAccount;
+                        lblShopId.Text = shop.ShopId;
+                        lblOrderId.Text = orderId;
+                        pnlUpdateRemark.Parent = dgvData.Parent;
+                        pnlUpdateRemark.BringToFront();
+                        pnlUpdateRemark.Visible = true;
+                    }
+                    break;
                 case "":
                     row.Cells[$"colDgv{dgvNum}check"].Value = !(bool)row.Cells[$"colDgv{dgvNum}check"].Value;
                     break;
@@ -1742,6 +2030,45 @@ namespace TemuKJD.WXForms.ShopForms
                 return true;
             return false;
         }
+
+        private void btnRemarkCancel_Click(object sender, EventArgs e)
+        {
+            txtRemark.Text = "";
+            lblOrderId.Text = "";
+            lblShopId.Text = "";
+            lblShopName.Text = "";
+            pnlUpdateRemark.Visible = false;
+        }
+
+        private void btnRemarkOK_Click(object sender, EventArgs e)
+        {
+            var cell = this.pnlUpdateRemark.Tag as DataGridViewCell;
+            if (cell == null)
+                return;
+
+            var url = BaseClass.BuildObjString("shop/add_mdy_express_optimize_remark");
+            var data = "";
+            data = UserLogin.GetSignaturex();
+            data += "&shop_id=" + lblShopId.Text;
+            data += "&order_id=" + lblOrderId.Text;
+            data += "&remark=" + txtRemark.Text.Trim();
+
+            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"))
+            {
+                BaseMsgForm.ShowError("修改备注失败，请重试！");
+                return;
+            }
+            cell.Value = txtRemark.Text.Trim().IsNullOrEmpty() ? "添加备注" : txtRemark.Text.Trim();
+
+            txtRemark.Text = "";
+            lblOrderId.Text = "";
+            lblShopId.Text = "";
+            lblShopName.Text = "";
+            pnlUpdateRemark.Visible = false;
+        }
     }
 
     public static class ShopOptimize

TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx

@@ -204,6 +204,9 @@
   <metadata name="colDgv1Optimize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colDgv1Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colDgv2Check.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -264,6 +267,9 @@
   <metadata name="colDgv2Optimize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colDgv2Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colDgv3Check.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -327,6 +333,9 @@
   <metadata name="colDgv3Optimize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colDgv3Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colDgv4Check.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -390,4 +399,7 @@
   <metadata name="colDgv4Optimize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colDgv4Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

TEMUKJD/WXForms/TalkForms/WxTalkForm.Designer.cs

@@ -47,20 +47,6 @@ namespace TemuKJD.WXForms.TalkForms
             this.chkIsAutoReply = new System.Windows.Forms.CheckBox();
             this.splitContainer4 = new System.Windows.Forms.SplitContainer();
             this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
-            this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
-            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
-            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colAutoReplyCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colWaitSend = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colWayBillError = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colAfterSale = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colPunishCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.pbLoading = new System.Windows.Forms.PictureBox();
             this.lblTalkCount = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
@@ -104,6 +90,23 @@ namespace TemuKJD.WXForms.TalkForms
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewLinkColumn2 = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
+            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colAutoReplyCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colWaitSend = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colWayBillError = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colAfterSale = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPunishCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.cmbFiltGroups = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
+            this.label5 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit();
             this.panel3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -367,6 +370,7 @@ namespace TemuKJD.WXForms.TalkForms
             // 
             // splitContainer4.Panel2
             // 
+            this.splitContainer4.Panel2.Controls.Add(this.cmbFiltGroups);
             this.splitContainer4.Panel2.Controls.Add(this.pbLoading);
             this.splitContainer4.Panel2.Controls.Add(this.lblTalkCount);
             this.splitContainer4.Panel2.Controls.Add(this.label6);
@@ -384,6 +388,7 @@ namespace TemuKJD.WXForms.TalkForms
             this.splitContainer4.Panel2.Controls.Add(this.label2);
             this.splitContainer4.Panel2.Controls.Add(this.label3);
             this.splitContainer4.Panel2.Controls.Add(this.line1);
+            this.splitContainer4.Panel2.Controls.Add(this.label5);
             this.splitContainer4.Size = new System.Drawing.Size(496, 548);
             this.splitContainer4.SplitterDistance = 450;
             this.splitContainer4.TabIndex = 7;
@@ -411,6 +416,7 @@ namespace TemuKJD.WXForms.TalkForms
             this.colShopLoginName,
             this.colShopId,
             this.colShopName,
+            this.colGroup,
             this.colShopNotes,
             this.colLoginStatus,
             this.colMessage,
@@ -435,115 +441,6 @@ namespace TemuKJD.WXForms.TalkForms
             this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
             this.dgvShop.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseClick);
             // 
-            // colSelect
-            // 
-            this.colSelect.HeaderText = "选";
-            this.colSelect.Name = "colSelect";
-            this.colSelect.ReadOnly = true;
-            this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colSelect.Visible = false;
-            this.colSelect.Width = 28;
-            // 
-            // colShopLoginName
-            // 
-            this.colShopLoginName.HeaderText = "店铺登录名";
-            this.colShopLoginName.Name = "colShopLoginName";
-            this.colShopLoginName.ReadOnly = true;
-            this.colShopLoginName.Visible = false;
-            // 
-            // colShopId
-            // 
-            this.colShopId.HeaderText = "店铺Id";
-            this.colShopId.Name = "colShopId";
-            this.colShopId.ReadOnly = true;
-            this.colShopId.Visible = false;
-            this.colShopId.Width = 55;
-            // 
-            // colShopName
-            // 
-            this.colShopName.FillWeight = 150F;
-            this.colShopName.HeaderText = "店铺名称";
-            this.colShopName.Name = "colShopName";
-            this.colShopName.ReadOnly = true;
-            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colShopName.Width = 70;
-            // 
-            // colShopNotes
-            // 
-            this.colShopNotes.HeaderText = "备注";
-            this.colShopNotes.Name = "colShopNotes";
-            this.colShopNotes.ReadOnly = true;
-            this.colShopNotes.Width = 70;
-            // 
-            // colLoginStatus
-            // 
-            this.colLoginStatus.HeaderText = "状态";
-            this.colLoginStatus.Name = "colLoginStatus";
-            this.colLoginStatus.ReadOnly = true;
-            this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colLoginStatus.Width = 38;
-            // 
-            // colMessage
-            // 
-            this.colMessage.HeaderText = "消息";
-            this.colMessage.Name = "colMessage";
-            this.colMessage.ReadOnly = true;
-            this.colMessage.Width = 90;
-            // 
-            // colAutoReplyCount
-            // 
-            this.colAutoReplyCount.HeaderText = "自动回复";
-            this.colAutoReplyCount.Name = "colAutoReplyCount";
-            this.colAutoReplyCount.ReadOnly = true;
-            this.colAutoReplyCount.Width = 62;
-            // 
-            // colWaitSend
-            // 
-            this.colWaitSend.HeaderText = "待发货";
-            this.colWaitSend.Name = "colWaitSend";
-            this.colWaitSend.ReadOnly = true;
-            this.colWaitSend.Width = 50;
-            // 
-            // colWayBillError
-            // 
-            this.colWayBillError.HeaderText = "物流异常";
-            this.colWayBillError.Name = "colWayBillError";
-            this.colWayBillError.ReadOnly = true;
-            this.colWayBillError.Width = 62;
-            // 
-            // colAfterSale
-            // 
-            this.colAfterSale.HeaderText = "售后";
-            this.colAfterSale.Name = "colAfterSale";
-            this.colAfterSale.ReadOnly = true;
-            this.colAfterSale.Width = 38;
-            // 
-            // colPunishCount
-            // 
-            this.colPunishCount.HeaderText = "店铺违规";
-            this.colPunishCount.Name = "colPunishCount";
-            this.colPunishCount.ReadOnly = true;
-            this.colPunishCount.Width = 62;
-            // 
-            // colScore
-            // 
-            this.colScore.HeaderText = "评分";
-            this.colScore.Name = "colScore";
-            this.colScore.ReadOnly = true;
-            this.colScore.Width = 38;
-            // 
-            // colCanUse
-            // 
-            this.colCanUse.HeaderText = "可用";
-            this.colCanUse.Name = "colCanUse";
-            this.colCanUse.ReadOnly = true;
-            this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colCanUse.Visible = false;
-            this.colCanUse.Width = 28;
-            // 
             // pbLoading
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
@@ -683,9 +580,9 @@ namespace TemuKJD.WXForms.TalkForms
             this.cmbFiltNotes.DropDownWidth = 1;
             this.cmbFiltNotes.FormattingEnabled = true;
             this.cmbFiltNotes.IntegralHeight = false;
-            this.cmbFiltNotes.Location = new System.Drawing.Point(61, 66);
+            this.cmbFiltNotes.Location = new System.Drawing.Point(208, 66);
             this.cmbFiltNotes.Name = "cmbFiltNotes";
-            this.cmbFiltNotes.Size = new System.Drawing.Size(252, 25);
+            this.cmbFiltNotes.Size = new System.Drawing.Size(105, 25);
             this.cmbFiltNotes.TabIndex = 0;
             this.cmbFiltNotes.Text = "全部";
             // 
@@ -793,11 +690,11 @@ namespace TemuKJD.WXForms.TalkForms
             // 
             this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(0, 70);
+            this.label3.Location = new System.Drawing.Point(172, 70);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(68, 17);
+            this.label3.Size = new System.Drawing.Size(44, 17);
             this.label3.TabIndex = 218;
-            this.label3.Text = "店铺备注：";
+            this.label3.Text = "备注：";
             // 
             // line1
             // 
@@ -1143,6 +1040,152 @@ namespace TemuKJD.WXForms.TalkForms
             this.dataGridViewLinkColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             this.dataGridViewLinkColumn2.Width = 106;
             // 
+            // colSelect
+            // 
+            this.colSelect.Frozen = true;
+            this.colSelect.HeaderText = "选";
+            this.colSelect.Name = "colSelect";
+            this.colSelect.ReadOnly = true;
+            this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colSelect.Visible = false;
+            this.colSelect.Width = 28;
+            // 
+            // colShopLoginName
+            // 
+            this.colShopLoginName.Frozen = true;
+            this.colShopLoginName.HeaderText = "店铺登录名";
+            this.colShopLoginName.Name = "colShopLoginName";
+            this.colShopLoginName.ReadOnly = true;
+            this.colShopLoginName.Visible = false;
+            // 
+            // colShopId
+            // 
+            this.colShopId.Frozen = true;
+            this.colShopId.HeaderText = "店铺Id";
+            this.colShopId.Name = "colShopId";
+            this.colShopId.ReadOnly = true;
+            this.colShopId.Visible = false;
+            this.colShopId.Width = 55;
+            // 
+            // colShopName
+            // 
+            this.colShopName.FillWeight = 150F;
+            this.colShopName.Frozen = true;
+            this.colShopName.HeaderText = "店铺名称";
+            this.colShopName.Name = "colShopName";
+            this.colShopName.ReadOnly = true;
+            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colShopName.Width = 70;
+            // 
+            // colGroup
+            // 
+            this.colGroup.Frozen = true;
+            this.colGroup.HeaderText = "分组";
+            this.colGroup.Name = "colGroup";
+            this.colGroup.ReadOnly = true;
+            this.colGroup.Width = 70;
+            // 
+            // colShopNotes
+            // 
+            this.colShopNotes.HeaderText = "备注";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
+            // 
+            // colLoginStatus
+            // 
+            this.colLoginStatus.HeaderText = "状态";
+            this.colLoginStatus.Name = "colLoginStatus";
+            this.colLoginStatus.ReadOnly = true;
+            this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colLoginStatus.Width = 38;
+            // 
+            // colMessage
+            // 
+            this.colMessage.HeaderText = "消息";
+            this.colMessage.Name = "colMessage";
+            this.colMessage.ReadOnly = true;
+            this.colMessage.Width = 90;
+            // 
+            // colAutoReplyCount
+            // 
+            this.colAutoReplyCount.HeaderText = "自动回复";
+            this.colAutoReplyCount.Name = "colAutoReplyCount";
+            this.colAutoReplyCount.ReadOnly = true;
+            this.colAutoReplyCount.Width = 62;
+            // 
+            // colWaitSend
+            // 
+            this.colWaitSend.HeaderText = "待发货";
+            this.colWaitSend.Name = "colWaitSend";
+            this.colWaitSend.ReadOnly = true;
+            this.colWaitSend.Width = 50;
+            // 
+            // colWayBillError
+            // 
+            this.colWayBillError.HeaderText = "物流异常";
+            this.colWayBillError.Name = "colWayBillError";
+            this.colWayBillError.ReadOnly = true;
+            this.colWayBillError.Width = 62;
+            // 
+            // colAfterSale
+            // 
+            this.colAfterSale.HeaderText = "售后";
+            this.colAfterSale.Name = "colAfterSale";
+            this.colAfterSale.ReadOnly = true;
+            this.colAfterSale.Width = 38;
+            // 
+            // colPunishCount
+            // 
+            this.colPunishCount.HeaderText = "店铺违规";
+            this.colPunishCount.Name = "colPunishCount";
+            this.colPunishCount.ReadOnly = true;
+            this.colPunishCount.Width = 62;
+            // 
+            // colScore
+            // 
+            this.colScore.HeaderText = "评分";
+            this.colScore.Name = "colScore";
+            this.colScore.ReadOnly = true;
+            this.colScore.Width = 38;
+            // 
+            // colCanUse
+            // 
+            this.colCanUse.HeaderText = "可用";
+            this.colCanUse.Name = "colCanUse";
+            this.colCanUse.ReadOnly = true;
+            this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colCanUse.Visible = false;
+            this.colCanUse.Width = 28;
+            // 
+            // cmbFiltGroups
+            // 
+            this.cmbFiltGroups.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbFiltGroups.DefaultText = "全部";
+            this.cmbFiltGroups.DropDownHeight = 1;
+            this.cmbFiltGroups.DropDownWidth = 1;
+            this.cmbFiltGroups.FormattingEnabled = true;
+            this.cmbFiltGroups.IntegralHeight = false;
+            this.cmbFiltGroups.Location = new System.Drawing.Point(61, 66);
+            this.cmbFiltGroups.Name = "cmbFiltGroups";
+            this.cmbFiltGroups.Size = new System.Drawing.Size(105, 25);
+            this.cmbFiltGroups.TabIndex = 772;
+            this.cmbFiltGroups.Text = "全部";
+            // 
+            // label5
+            // 
+            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(0, 70);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(68, 17);
+            this.label5.TabIndex = 774;
+            this.label5.Text = "店铺分组：";
+            // 
             // WxTalkForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1243,10 +1286,17 @@ namespace TemuKJD.WXForms.TalkForms
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.CheckBox chkShowShopStatistics;
         private System.Windows.Forms.CheckBox chkShowAutoReplyNum;
+        private DevComponents.DotNetBar.PanelEx btnMultiLogin;
+        private DevComponents.DotNetBar.PanelEx btnChangeAddress;
+        private System.Windows.Forms.Label lblProgress;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.Label lblAutoReplyStatus;
+        private System.Windows.Forms.TextBox textBox1;
         private UserComponent.UcDataGridViewCheckBoxColumn colSelect;
         private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
         private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
         private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
         private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
         private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
@@ -1257,11 +1307,7 @@ namespace TemuKJD.WXForms.TalkForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colPunishCount;
         private System.Windows.Forms.DataGridViewTextBoxColumn colScore;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
-        private DevComponents.DotNetBar.PanelEx btnMultiLogin;
-        private DevComponents.DotNetBar.PanelEx btnChangeAddress;
-        private System.Windows.Forms.Label lblProgress;
-        private System.Windows.Forms.TabPage tabPage3;
-        private System.Windows.Forms.Label lblAutoReplyStatus;
-        private System.Windows.Forms.TextBox textBox1;
+        private UserComponent.UcComboBoxMutiSelect cmbFiltGroups;
+        private System.Windows.Forms.Label label5;
     }
 }

TEMUKJD/WXForms/TalkForms/WxTalkForm.cs

@@ -36,6 +36,8 @@ namespace TemuKJD.WXForms.TalkForms
 {
     public partial class WxTalkForm : BaseTalkForm
     {
+        public static WxTalkForm instance { get; set; }
+
         /// <summary>
         /// 自动回复话术信息
         /// </summary>
@@ -90,6 +92,7 @@ namespace TemuKJD.WXForms.TalkForms
         {
             InitializeComponent();
 
+            instance = this;
             ChatConfig.LoadChatSetting();
         }
 
@@ -190,6 +193,10 @@ namespace TemuKJD.WXForms.TalkForms
                     {
                         this.cmbFiltNotes.Items.Add(shopNote);
                     }
+                    foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
+                    {
+                        this.cmbFiltGroups.Items.Add(group);
+                    }
 
                     lstShopAfterSale = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<WxTalkFormShopMainInfo>>("wx_shop_after_sale_list");
                     if (lstShopAfterSale == null)
@@ -587,6 +594,7 @@ namespace TemuKJD.WXForms.TalkForms
                     r.Cells["colShopName"].Value = shop.ShopAccount; // 店铺名称
                     //r.Cells["colShopName"].Style.ForeColor = LstTagShop.Contains(shop.ShopId) ? Color.LightGreen : Control.DefaultForeColor;
                     r.Cells["colShopName"].Style.BackColor = LstTagShop.Contains(shop.ShopId) ? Color.LightGreen : (r.Tag is Color ? (Color)r.Tag : Color.White);
+                    r.Cells["colGroup"].Value = shop.GroupName; // 分组
                     r.Cells["colShopNotes"].Value = shop.Notes; // 备注
                     r.Cells["colAutoReplyCount"].Value = dicTalkAutoReplyCount.FirstOrDefault(t => t.Key == shop.ShopId).Value.ParseToInt();
                     r.Cells["colLoginStatus"].Value = shop.LoginStatus == "登录成功" ? "在线" : "掉线"; // 登录状态
@@ -1387,24 +1395,29 @@ namespace TemuKJD.WXForms.TalkForms
         {
             string shopName = txtFiltShopName.Text.Trim();
             string notes = cmbFiltNotes.Text.Trim().Trim(';');
+            string groups = cmbFiltGroups.Text.Trim().Trim(';');
             if (notes == "全部")
                 notes = "";
+            if (groups == "全部")
+                groups = "";
             List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            foreach(DataGridViewRow row in dgvShop.Rows)
+            List<string> groupsLst = groups.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                if ((string.IsNullOrEmpty(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())) && row.Cells["colShopName"].Value.ParseToString().Contains(shopName))
-                {
-                    row.Visible = true;
-                }
-                else
-                {
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(shopName))
                     row.Visible = false;
-                }
+                else if (!string.IsNullOrEmpty(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    row.Visible = false;
+                else if (!string.IsNullOrEmpty(groups) && !groupsLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    row.Visible = false;
+                else
+                    row.Visible = true;
             }
         }
 
         private void btnEmpty_Click(object sender, EventArgs e)
         {
+            cmbFiltGroups.Text = "全部";
             cmbFiltNotes.Text = "全部";
             btnFilterShop_Click(null, null);
         }

TEMUKJD/WXForms/TalkForms/WxTalkForm.resx

@@ -126,6 +126,9 @@
   <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colGroup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Work/UserLogin.cs

@@ -84,8 +84,10 @@ namespace Work
             BaseClass.UserKey = BaseRegex.GetStringJson(ref html, "user_key").ParseToInt();
             BaseClass.NickName = BaseRegex.GetStringJson(ref html, "nick_name");
             BaseClass.UserName = BaseRegex.GetStringJson(ref html, "user_name");
+            BaseClass.ParentUserName = BaseRegex.GetStringJson(ref html, "parent_user_name");
             BaseClass.SaLevel = BaseRegex.GetIntJson(ref html, "sa_level").ParseToInt();
             BaseClass.UserAuthority = BaseRegex.GetStringJson(ref html, "authority").ParseToString();
+            BaseClass.ParentAuthority = BaseRegex.GetStringJson(ref html, "parent_authority").ParseToString();
             BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile");
             BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt();
             BaseClass.UserVersionString = BaseRegex.GetStringJson(ref html, "version_s");