代发管理 爆款数据更新曝光量 店铺统计优化 增加反向物流考核功能

AllBase/AllBase.csproj

@@ -218,8 +218,11 @@
     <Compile Include="Model\Result\PDDResult\PddCatInfo.cs" />
     <Compile Include="Model\Result\PDDResult\PddClientInfo.cs" />
     <Compile Include="Model\Result\VDianShopLoginInfo.cs" />
+    <Compile Include="Model\Result\WXResult\DSRShopScoreInfo.cs" />
+    <Compile Include="Model\Result\WXResult\WxActivityData.cs" />
     <Compile Include="Model\Result\WXResult\WXAddressInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXClientProductInfoLite.cs" />
+    <Compile Include="Model\Result\WXResult\WxConsignmentOrderInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXFinderTalentInfo.cs" />
     <Compile Include="Model\Result\WXResult\WXGetEditProductInfoLite.cs" />
     <Compile Include="Model\Param\WXParam\WXGetShortTitleParam.cs" />
@@ -289,6 +292,7 @@
     <Compile Include="Model\Result\WXResult\GetProdCateInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxCatInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeExpressInfo.cs" />
+    <Compile Include="Model\Result\WXResult\WxOptimizeFeedbackOrderInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeOrderAfterSaleInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeProductEvaluationInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxOptimizeLinerCgiInfo.cs" />

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1075;
+        public static int VersionCount = 1086;
         //public static int VersionCount = 613;
 
         /// <summary>

AllBase/Model/Config/WxShopMainStatistics.cs

@@ -1,4 +1,5 @@
-using System;
+using AllBase.Model.Result.WXResult;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -75,6 +76,7 @@ namespace AllBase.Model.Config
 
         public int? ProdCount { get; set; }
         public decimal? curScoreValue {get;set;}
+        public DSRShopScoreRetInfo scoreRetInfo { get; set; } = new DSRShopScoreRetInfo();
         public DateTime lastRefreshDate { get; set; } = DateTime.MinValue;
 
         /// <summary>

AllBase/Model/Result/PDDResult/PddBuyerOrderInfoLite.cs

@@ -38,6 +38,7 @@ namespace AllBase.Model.Result.PDDResult
             if (expressCompanyName.Contains("京东快递")) return "JD";
             if (expressCompanyName.Contains("京东快运")) return "JDKY";
             if (expressCompanyName.Contains("京东大件物流")) return "JD";
+            if (expressCompanyName.Contains("其他快递")) return "OTHER";
             return "";
         }
 

AllBase/Model/Result/WXResult/DSRShopScoreInfo.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+    public class DSRShopScoreRetInfo
+    {
+        public int? code { get; set; } // 0
+        public DSRShopScoreInfo dsrScore { get; set; }
+        public extInfo ext { get; set; }
+    }
+
+    public class extInfo
+    {
+        public int? version { get; set; } // 1
+
+    }
+
+    public class DSRShopScoreInfo
+    {
+        public decimal? curValue { get; set; } // 4.87, // 综合得分
+        public decimal? rankRatio { get; set; } // 0.9107, //优于91.07%同行
+        public int? level { get; set; } // 3, // 3好 2中 1差
+        public List<ScoreValueInfo> valueList { get; set; }
+        public string curDate { get; set; } // "20260518"
+    }
+
+    public class ScoreValueInfo
+    { 
+        public string date { get; set; } // "20260518",
+        public decimal? value { get; set; } // 4.87,
+        public decimal? grossAvgValue { get; set; } // 4.633553482240027,
+        public decimal? scoreMedian { get; set; } // 0.0472,
+        public int? level { get; set; } // 3
+
+    }
+}

AllBase/Model/Result/WXResult/WxActivityData.cs

@@ -0,0 +1,61 @@
+using AllBase.Model.Param.WXParam;
+using NaiBa.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+    public class WxActivityData
+    {
+        public requestProductInfoList requestProductInfoList { get; set; } = new requestProductInfoList();
+        public ConcurrentList<WXProductParam> productList { get; set; } = new ConcurrentList<WXProductParam>();
+        //public int? totalNum { get; set; } // "1648"
+        //public int? totalPage { get; set; } // "165"
+    }
+
+    public class requestProductInfoList
+    {
+        public int? code { get; set; } // 0
+        public ConcurrentList<requestProductInfoResult> resultList { get; set; } = new ConcurrentList<requestProductInfoResult>();
+    }
+
+    public class requestProductInfoResult
+    {
+        public string shopId { get; set; }
+
+
+        public requestProductInfo product { get; set; }
+
+        /// <summary>
+        /// 是否已报名活动
+        /// </summary>
+        public bool? isAdded { get; set; } // true
+        public int? activityStockNum { get; set; } // 0
+        public int? activityPrice { get; set; } // 557
+        public int? dailyStock { get; set; } // 0,
+        public int? stockMode { get; set; } // 1,
+
+        public string invalidString { get; set; } // "",
+        public string invalidStringPrecheck { get; set; } // "",
+        public int? canSetLowestPrice { get; set; } // 0,
+        public int? minActivityPrice { get; set; } // 567,
+        public int? minStockNum { get; set; } // 0,
+        public int? defaultStockMode { get; set; } // 1,
+        public string maxPlatform_618Discount { get; set; } // "28",
+        public string maxPlatform_618DiscountMerchant { get; set; } // "42",
+        public string maxPlatformSubsidy { get; set; } // "28",
+        public string maxMerchantSubsidy { get; set; } // "42",
+        public string validPrice { get; set; } // "567",
+        public string salePrice { get; set; } // "567"
+    }
+
+    public class requestProductInfo
+    {     
+        public string productId { get; set; } // "10000848702293",
+        public string skuId { get; set; } // "14973867421"
+
+    }
+}

AllBase/Model/Result/WXResult/WxConsignmentOrderInfo.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+    public class WxConsignmentOrderInfo
+    {
+        public WxConsignmentOrderCommonInfo commonInfo { get; set; }
+        public List<WxConsignmentOrderProductInfo> productsList { get; set; }
+        public WxConsignmentOrderEditAddrInfo editAddrInfo { get; set; }
+        public WxConsignmentOrderBuyerInfo buyerInfo { get; set; }
+        public WxConsignmentOrderNotesInfo notesInfo { get; set; }
+        public WxConsignmentOrderPresentInfo presentInfo { get; set; }
+        public object expressData { get; set; }
+        public WxConsignmentOrderInspectInfo inspectInfo { get; set; }
+        public WxConsignmentOrderCustomInfo customInfo { get; set; }
+        public WxConsignmentOrderBackUpInfo backUpInfo { get; set; }
+    }
+
+    public class WxConsignmentOrderBackUpInfo
+    {
+        public int? type { get; set; } // 0,
+        public string title { get; set; } // "",
+        public string taskId { get; set; } // "",
+        public object delayDeliveryInfo { get; set; } // { }
+    }
+
+    public class WxConsignmentOrderCustomInfo
+    {
+        public string content { get; set; } // "",
+        public int? type { get; set; } // 0,
+        public string previewImgUrl { get; set; } // ""
+    }
+
+    public class WxConsignmentOrderInspectInfo
+    {
+        public string inspectOrgName { get; set; } // "",
+        public string warehouseName { get; set; } // ""
+
+    }
+
+    public class WxConsignmentOrderPresentInfo
+    {
+        public string presentOrderId { get; set; } // "",
+        public string greetingMessage { get; set; } // ""
+
+    }
+
+    public class WxConsignmentOrderNotesInfo
+    {
+        public bool? hasNotes { get; set; } // true,
+        public string customerNotes { get; set; } // "",
+        public string merchantNotes { get; set; } // "260517-004110435981905",
+        public string presentNotes { get; set; } // ""
+    }
+
+    public class WxConsignmentOrderBuyerInfo
+    {
+        public string nickName { get; set; } // ""
+    }
+
+    public class WxConsignmentOrderEditAddrInfo
+    {
+        public int? applyEditAddrStatus { get; set; } // 0,
+        public string applyEditAddrAuditStaff { get; set; } // "",
+        public string applyEditAddrAuditTimeText { get; set; } // ""
+
+    }
+
+    public class WxConsignmentOrderProductInfo
+    {
+        public string productId { get; set; } // "10000845960754",
+        public string thumbImg { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69de113c00028665206560e2d33f0315000000a100004f50",
+        public string title { get; set; } // "应急灯家用超长续航充电停电太阳能户外备用照明手提马灯露营挂灯",
+        public string skuId { get; set; } // "14913157803",
+        public List<string> saleParam { get; set; } // [ "一拉既亮【金黄色】充手机+一灯四用", "尊享版-太阳能O电费【900N】超长续航36" ],
+        public int? productCnt { get; set; } // 1,
+        public string deliveryTimeStr { get; set; } // "",
+        public List<object> icons { get; set; } // [ ],
+        public string perExchangeScore { get; set; } // "",
+        public List<object> warning { get; set; } // [ ],
+        public string salePrice { get; set; } // "4590",
+        public string spuCode { get; set; } // "EC110000617310104A",
+        public string skuCode { get; set; } // "BSHY-923-SKYH-YS",
+        public bool? isPreSale { get; set; } // false,
+        public bool? isFreeGift { get; set; } // false,
+        public string afterSaleStatusStr { get; set; } // "",
+        public int? realPrice { get; set; } // 4590,
+        public int? perRealPrice { get; set; } // 4590
+
+    }
+
+    public class WxConsignmentOrderCommonInfo
+    {
+        public string cosignmentOrderId { get; set; } // "4436453689109278464",
+        public string orderId { get; set; } // "3736453673788794624",
+        public int? status { get; set; } // 100,
+        public string statusStr { get; set; } // "待发货",
+        public string createTimeStr { get; set; } // "5/18 04:31",
+        public string createTimeStrForB { get; set; } // "2026/05/18 04:31",
+        public string orderCreateTimeStrForB { get; set; } // "2026/05/18 04:30",
+        public string supplierName { get; set; } // "一组专用",
+        public bool? isGiftOrder { get; set; } // false
+
+    }
+}

AllBase/Model/Result/WXResult/WxOptimizeFeedbackOrderInfo.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.WXResult
+{
+    public class WxOptimizeFeedbackOrderInfo
+    {
+        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; }
+        /// <summary>
+        /// 收货 省
+        /// </summary>
+        public string province { get; set; }
+        /// <summary>
+        /// 收货 市
+        /// </summary>
+        public string city { get; set; }
+        /// <summary>
+        /// 收货 区
+        /// </summary>
+        public string district‌ { get; set; }
+
+
+        public FeedbackOrderInfo orderInfo { get; set; }
+        public string negativeReviewReason { get; set; } // "",
+        public string complainReason { get; set; } // "投诉-物流停滞问题-长时间未更新物流信息",
+        public string payTime { get; set; } // "1776581954",
+        public FeedbackDeliveryInfo delivery { get; set; }
+        public string waybillId { get; set; } // "777402213446534"
+    }
+
+    public class FeedbackDeliveryInfo
+    {
+        public string deliveryId { get; set; } // "STO",
+        public string deliveryName { get; set; } // "申通快递",
+        public string imgUrl { get; set; } // "https://res.wx.qq.com/shop/public/2023-07-11/691c3b97-4120-48aa-9d9e-8349ec367cd6.png"
+    }
+
+    public class FeedbackOrderInfo
+    {
+        public string name { get; set; } // "【带透气网】中年妈妈装春夏短款马甲女休闲洋气坎肩外穿背心马夹",
+        public string skuName { get; set; } // "白色-2XL推荐120-135斤",
+        public string spuId { get; set; } // "10000714592956",
+        public string orderId { get; set; } // "3735806733643560704",
+        public string price { get; set; } // "5388",
+        public int? productCnt { get; set; } // 1,
+        public string imgUrl { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69ddbc1e0009f7e724a46d3bc461b01e000000a100004f50",
+        public string skuCode { get; set; } // "",
+        public string skuThumbUrl { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/69ddbc1e0009f7e724a46d3bc461b01e000000a100004f50"
+
+    }
+}

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -55,7 +55,7 @@ namespace KJD_Web.BLL.BXX
                 string group = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "group"))?.Replace("'", "\\'");
                 string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes"))?.Replace("'", "\\'");
                 string product_get_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_get_type"))?.Replace("'", "\\'");
-                string sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.Replace("'", "\\'");
+                int? sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.ParseToNullableInt();
                 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 add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'");
@@ -180,7 +180,7 @@ namespace KJD_Web.BLL.BXX
                 string main_img = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "main_img"))?.Replace("'", "\\'");
                 string group = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "group"))?.Replace("'", "\\'");
                 string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes"))?.Replace("'", "\\'");
-                string sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.Replace("'", "\\'");
+                int? sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.ParseToNullableInt();
                 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("'", "\\'");
@@ -400,6 +400,58 @@ namespace KJD_Web.BLL.BXX
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
+
+        /// <summary>
+        /// 更新爆款数据商品
+        /// </summary>
+        /// <param name="inputData"></param>
+        /// <returns></returns>
+        public string MdyBestSaleProd(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var time = 0;
+                int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time);
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(user_name))
+                {
+                    return "{\"code\":500,\"msg\":\"没有用户名\"}";
+                }
+
+                string spu_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "spu_id"))?.Replace("'", "\\'");
+                int? view_uv = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "view_uv"))?.ParseToNullableInt();
+                if (view_uv == null || string.IsNullOrWhiteSpace(spu_id))
+                    return "{\"code\":500,\"msg\":\"缺少商品曝光率或编号信息\"}";
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+                string sql = "";
+
+                sql = "update bxx.product p set";
+                if (view_uv != null)
+                    sql += " p.view_uv=" + view_uv + ",";
+                sql += " p.mdy_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',";
+                sql = sql.TrimEnd(',');
+                sql += " where p.spu_id='" + spu_id + "' and p.special_prod_type='爆款数据'";
+
+                var rst = mySql.ExecuteNonQuery(sql);
+                mySql.Close();
+                if (rst)
+                {
+                    return "{\"code\":200,\"msg\":\"success\"}";
+                }
+                else
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
         /// <summary>
         /// 获取商品SpuId（快速查询）
         /// </summary>
@@ -541,6 +593,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 min_view_uv = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "min_view_uv"))?.ParseToNullableInt();
                 var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count").ParseToBool(); // 不计数
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
@@ -702,6 +755,10 @@ namespace KJD_Web.BLL.BXX
                 {
                     where += " and p.ban_pdd=" + ban_pdd;
                 }
+                if (min_view_uv != null)
+                {
+                    where += " and p.view_uv>=" + min_view_uv;
+                }
                 if (!string.IsNullOrEmpty(add_user_name))
                 {
                     add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";

KJDService/KJD_WebService/BLL/WXXD/WXProductManage.cs

@@ -367,10 +367,15 @@ namespace KJD_Web.BLL.WXXD
             */
         }
 
-        public String WXMdyPDDProduct(string inputData)
+        public string WXMdyPDDProduct(string inputData)
         {
             return new BXX.BXXProductManage().MdyProduct(inputData);
         }
+         
+        public string MdyBestSaleProd(string inputData)
+        {
+            return new BXX.BXXProductManage().MdyBestSaleProd(inputData);
+        }
 
         public string WXAddSecretSpuIdShopIdMap(string inputData)
         {

KJDService/KJD_WebService/BXXProductService.asmx.cs

@@ -194,6 +194,18 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void mdy_best_sale_prod()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new BXXProductManage().MdyBestSaleProd(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void del_db_product()
         {

KJDService/KJD_WebService/WXProductService.asmx.cs

@@ -134,6 +134,18 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void mdy_best_sale_prod()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXProductManage().MdyBestSaleProd(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void set_random_company_product_config()
         {

TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs

@@ -129,8 +129,18 @@ namespace TemuKJD.BLL.Wx
                                         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) // 爆款数据商品已存在，继续
+                                        if (existHotProd != null) // 爆款数据商品已存在，更新下曝光量view_uv后继续
+                                        {
+                                            if(existHotProd.view_uv.ParseToInt() < recommendProd.product_view_uv.ParseToInt())
+                                            {
+                                                url = BaseClass.BuildObjString("product/mdy_best_sale_prod");
+                                                data = UserLogin.GetSignaturex() +
+                                                    "&spu_id=" + existHotProd.spu_id +
+                                                    "&view_uv=" + recommendProd.product_view_uv;
+                                                html = GetHtml.PostUtf8(url, data);
+                                            }
                                             continue;
+                                        }
                                         #endregion 
 
                                         WXGetEditProductInfoLite wxProdInfoLite = null;

TEMUKJD/KJD.csproj

@@ -288,6 +288,18 @@
     <Compile Include="WXForms\AdminForms\WXWaybillManageForm.Designer.cs">
       <DependentUpon>WXWaybillManageForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="WXForms\ProductForms\ActivityForms\WXActivity618Form.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\ProductForms\ActivityForms\WXActivity618Form.Designer.cs">
+      <DependentUpon>WXActivity618Form.cs</DependentUpon>
+    </Compile>
+    <Compile Include="WXForms\ProductForms\WXOrderConsignmentForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\ProductForms\WXOrderConsignmentForm.Designer.cs">
+      <DependentUpon>WXOrderConsignmentForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="WXForms\ProductForms\WXProdClearNoVisitForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1357,6 +1369,12 @@
     <EmbeddedResource Include="WXForms\AdminForms\WXWaybillManageForm.resx">
       <DependentUpon>WXWaybillManageForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\ProductForms\ActivityForms\WXActivity618Form.resx">
+      <DependentUpon>WXActivity618Form.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\ProductForms\WXOrderConsignmentForm.resx">
+      <DependentUpon>WXOrderConsignmentForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WXForms\ProductForms\WXProdClearNoVisitForm.resx">
       <DependentUpon>WXProdClearNoVisitForm.cs</DependentUpon>
     </EmbeddedResource>

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs

@@ -78,15 +78,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnPushToOutServer = new DevComponents.DotNetBar.PanelEx();
             this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.txtViewUvMin = new System.Windows.Forms.TextBox();
+            this.chkViewUvMin = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.cmbPddRelation = new System.Windows.Forms.ComboBox();
             this.label19 = new System.Windows.Forms.Label();
             this.dtpEnd = new System.Windows.Forms.DateTimePicker();
             this.dtpStart = new System.Windows.Forms.DateTimePicker();
-            this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.cmbCat2 = new System.Windows.Forms.ComboBox();
             this.label16 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.cmbSpProdType = new System.Windows.Forms.ComboBox();
             this.txtSecretStyleCode = new System.Windows.Forms.TextBox();
             this.label14 = new System.Windows.Forms.Label();
             this.label15 = new System.Windows.Forms.Label();
@@ -94,14 +95,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSourceType = new System.Windows.Forms.ComboBox();
             this.label10 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.label11 = new System.Windows.Forms.Label();
             this.txtSPU = new System.Windows.Forms.TextBox();
             this.cmbWxCat = new System.Windows.Forms.ComboBox();
             this.txtSKC = new System.Windows.Forms.TextBox();
             this.cmbSort = new System.Windows.Forms.ComboBox();
             this.label6 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
-            this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.label12 = new System.Windows.Forms.Label();
             this.txtExtCode = new System.Windows.Forms.TextBox();
             this.lblGroup = new System.Windows.Forms.Label();
@@ -120,6 +119,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtRealCoid = new System.Windows.Forms.TextBox();
             this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
             this.btnSearch = new DevComponents.DotNetBar.PanelEx();
+            this.label11 = new System.Windows.Forms.Label();
+            this.cmbSpProdType = new System.Windows.Forms.ComboBox();
+            this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.chkPullAfterPush = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
@@ -443,7 +445,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // txtReplaceText
             // 
-            this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.txtReplaceText.Location = new System.Drawing.Point(99, 12);
             this.txtReplaceText.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtReplaceText.Name = "txtReplaceText";
@@ -453,7 +456,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // 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(2, 15);
             this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
@@ -627,7 +629,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             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(913, 81);
+            this.btnStopStop.Location = new System.Drawing.Point(919, 81);
             this.btnStopStop.Name = "btnStopStop";
             this.btnStopStop.Size = new System.Drawing.Size(90, 25);
             this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -653,7 +655,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnPull.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnPull.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnPull.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPull.Location = new System.Drawing.Point(971, 33);
+            this.btnPull.Location = new System.Drawing.Point(977, 33);
             this.btnPull.Name = "btnPull";
             this.btnPull.Size = new System.Drawing.Size(32, 25);
             this.btnPull.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -678,7 +680,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnPushToOutServer.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnPushToOutServer.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnPushToOutServer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPushToOutServer.Location = new System.Drawing.Point(913, 33);
+            this.btnPushToOutServer.Location = new System.Drawing.Point(919, 33);
             this.btnPushToOutServer.Name = "btnPushToOutServer";
             this.btnPushToOutServer.Size = new System.Drawing.Size(56, 25);
             this.btnPushToOutServer.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -703,7 +705,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnGetProdWxCate.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnGetProdWxCate.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnGetProdWxCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnGetProdWxCate.Location = new System.Drawing.Point(913, 5);
+            this.btnGetProdWxCate.Location = new System.Drawing.Point(919, 5);
             this.btnGetProdWxCate.Name = "btnGetProdWxCate";
             this.btnGetProdWxCate.Size = new System.Drawing.Size(90, 25);
             this.btnGetProdWxCate.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -726,31 +728,34 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 15;
+            this.tableLayoutPanel1.ColumnCount = 17;
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28486F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.49878F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28486F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.49878F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28486F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.49878F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28486F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.49878F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28686F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50053F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28686F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50053F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 14.28686F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50053F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50328F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel1.Controls.Add(this.txtViewUvMin, 13, 1);
+            this.tableLayoutPanel1.Controls.Add(this.chkViewUvMin, 12, 1);
             this.tableLayoutPanel1.Controls.Add(this.cmbPddRelation, 13, 0);
             this.tableLayoutPanel1.Controls.Add(this.label19, 12, 0);
             this.tableLayoutPanel1.Controls.Add(this.dtpEnd, 11, 2);
             this.tableLayoutPanel1.Controls.Add(this.dtpStart, 9, 2);
-            this.tableLayoutPanel1.Controls.Add(this.ucCheckBox1, 8, 2);
+            this.tableLayoutPanel1.Controls.Add(this.chkTime, 8, 2);
             this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 2);
             this.tableLayoutPanel1.Controls.Add(this.label16, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.cmbSpProdType, 13, 1);
             this.tableLayoutPanel1.Controls.Add(this.txtSecretStyleCode, 5, 0);
             this.tableLayoutPanel1.Controls.Add(this.label14, 4, 2);
             this.tableLayoutPanel1.Controls.Add(this.label15, 4, 0);
@@ -758,14 +763,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 5, 1);
             this.tableLayoutPanel1.Controls.Add(this.label10, 4, 1);
             this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.label11, 12, 1);
             this.tableLayoutPanel1.Controls.Add(this.txtSPU, 1, 0);
             this.tableLayoutPanel1.Controls.Add(this.cmbWxCat, 11, 0);
             this.tableLayoutPanel1.Controls.Add(this.txtSKC, 1, 1);
             this.tableLayoutPanel1.Controls.Add(this.cmbSort, 7, 1);
             this.tableLayoutPanel1.Controls.Add(this.label6, 6, 1);
             this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
-            this.tableLayoutPanel1.Controls.Add(this.chkWXComplateProd, 13, 2);
             this.tableLayoutPanel1.Controls.Add(this.label12, 10, 0);
             this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 7, 0);
             this.tableLayoutPanel1.Controls.Add(this.lblGroup, 2, 1);
@@ -782,8 +785,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 7, 2);
             this.tableLayoutPanel1.Controls.Add(this.label17, 6, 2);
             this.tableLayoutPanel1.Controls.Add(this.txtRealCoid, 1, 2);
-            this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 14, 1);
-            this.tableLayoutPanel1.Controls.Add(this.btnSearch, 14, 0);
+            this.tableLayoutPanel1.Controls.Add(this.btnEmpty, 16, 1);
+            this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label11, 14, 0);
+            this.tableLayoutPanel1.Controls.Add(this.cmbSpProdType, 15, 0);
+            this.tableLayoutPanel1.Controls.Add(this.chkWXComplateProd, 13, 2);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
@@ -791,9 +797,28 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33445F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33112F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(885, 105);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(900, 105);
             this.tableLayoutPanel1.TabIndex = 679;
             // 
+            // txtViewUvMin
+            // 
+            this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtViewUvMin.Location = new System.Drawing.Point(693, 41);
+            this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.txtViewUvMin.Name = "txtViewUvMin";
+            this.txtViewUvMin.Size = new System.Drawing.Size(38, 23);
+            this.txtViewUvMin.TabIndex = 980;
+            // 
+            // chkViewUvMin
+            // 
+            this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.chkViewUvMin.Location = new System.Drawing.Point(634, 42);
+            this.chkViewUvMin.Name = "chkViewUvMin";
+            this.chkViewUvMin.Size = new System.Drawing.Size(56, 21);
+            this.chkViewUvMin.TabIndex = 978;
+            this.chkViewUvMin.Text = "曝光≥";
+            this.chkViewUvMin.UseVisualStyleBackColor = true;
+            // 
             // cmbPddRelation
             // 
             this.cmbPddRelation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -802,17 +827,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbPddRelation.Location = new System.Drawing.Point(777, 7);
+            this.cmbPddRelation.Location = new System.Drawing.Point(693, 5);
             this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbPddRelation.Name = "cmbPddRelation";
-            this.cmbPddRelation.Size = new System.Drawing.Size(52, 25);
+            this.cmbPddRelation.Size = new System.Drawing.Size(38, 25);
             this.cmbPddRelation.TabIndex = 805;
             // 
             // label19
             // 
             this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(709, 9);
+            this.label19.Location = new System.Drawing.Point(625, 9);
             this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(68, 17);
@@ -825,10 +850,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.SetColumnSpan(this.dtpEnd, 2);
             this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpEnd.Location = new System.Drawing.Point(651, 76);
+            this.dtpEnd.Location = new System.Drawing.Point(581, 76);
             this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.dtpEnd.Name = "dtpEnd";
-            this.dtpEnd.Size = new System.Drawing.Size(123, 23);
+            this.dtpEnd.Size = new System.Drawing.Size(109, 23);
             this.dtpEnd.TabIndex = 979;
             // 
             // dtpStart
@@ -837,30 +862,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.SetColumnSpan(this.dtpStart, 2);
             this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpStart.Location = new System.Drawing.Point(525, 76);
+            this.dtpStart.Location = new System.Drawing.Point(469, 76);
             this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.dtpStart.Name = "dtpStart";
-            this.dtpStart.Size = new System.Drawing.Size(123, 23);
+            this.dtpStart.Size = new System.Drawing.Size(109, 23);
             this.dtpStart.TabIndex = 978;
             // 
-            // ucCheckBox1
+            // chkTime
             // 
-            this.ucCheckBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.ucCheckBox1.Location = new System.Drawing.Point(457, 77);
-            this.ucCheckBox1.Name = "ucCheckBox1";
-            this.ucCheckBox1.Size = new System.Drawing.Size(65, 21);
-            this.ucCheckBox1.TabIndex = 977;
-            this.ucCheckBox1.Text = "时间范围";
-            this.ucCheckBox1.UseVisualStyleBackColor = true;
+            this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.chkTime.Location = new System.Drawing.Point(401, 77);
+            this.chkTime.Name = "chkTime";
+            this.chkTime.Size = new System.Drawing.Size(65, 21);
+            this.chkTime.TabIndex = 977;
+            this.chkTime.Text = "时间范围";
+            this.chkTime.UseVisualStyleBackColor = true;
             // 
             // cmbCat2
             // 
             this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat2.FormattingEnabled = true;
-            this.cmbCat2.Location = new System.Drawing.Point(290, 75);
+            this.cmbCat2.Location = new System.Drawing.Point(262, 75);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(52, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(38, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged);
             // 
@@ -886,34 +911,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label1.TabIndex = 813;
             this.label1.Text = "真实coid：";
             // 
-            // cmbSpProdType
-            // 
-            this.cmbSpProdType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbSpProdType.FormattingEnabled = true;
-            this.cmbSpProdType.Items.AddRange(new object[] {
-            "",
-            "普通商品",
-            "爆款数据"});
-            this.cmbSpProdType.Location = new System.Drawing.Point(777, 42);
-            this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.cmbSpProdType.Name = "cmbSpProdType";
-            this.cmbSpProdType.Size = new System.Drawing.Size(52, 25);
-            this.cmbSpProdType.TabIndex = 677;
-            // 
             // txtSecretStyleCode
             // 
             this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSecretStyleCode.Location = new System.Drawing.Point(290, 6);
+            this.txtSecretStyleCode.Location = new System.Drawing.Point(262, 6);
             this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSecretStyleCode.Name = "txtSecretStyleCode";
-            this.txtSecretStyleCode.Size = new System.Drawing.Size(52, 23);
+            this.txtSecretStyleCode.Size = new System.Drawing.Size(38, 23);
             this.txtSecretStyleCode.TabIndex = 812;
             // 
             // label14
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(239, 79);
+            this.label14.Location = new System.Drawing.Point(211, 79);
             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);
@@ -924,7 +935,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(246, 9);
+            this.label15.Location = new System.Drawing.Point(218, 9);
             this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(44, 17);
@@ -935,7 +946,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(583, 44);
+            this.label13.Location = new System.Drawing.Point(513, 44);
             this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(68, 17);
@@ -956,10 +967,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(290, 40);
+            this.cmbSourceType.Location = new System.Drawing.Point(262, 40);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(52, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(38, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             // 
@@ -967,7 +978,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(246, 44);
+            this.label10.Location = new System.Drawing.Point(218, 44);
             this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(44, 17);
@@ -985,24 +996,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label5.TabIndex = 435;
             this.label5.Text = "商品ID：";
             // 
-            // label11
-            // 
-            this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(709, 44);
-            this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-            this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(68, 17);
-            this.label11.TabIndex = 651;
-            this.label11.Text = "商品类型：";
-            // 
             // txtSPU
             // 
             this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.txtSPU.Location = new System.Drawing.Point(72, 6);
             this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(52, 23);
+            this.txtSPU.Size = new System.Drawing.Size(38, 23);
             this.txtSPU.TabIndex = 434;
             // 
             // cmbWxCat
@@ -1013,10 +1013,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbWxCat.Location = new System.Drawing.Point(651, 5);
+            this.cmbWxCat.Location = new System.Drawing.Point(581, 5);
             this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxCat.Name = "cmbWxCat";
-            this.cmbWxCat.Size = new System.Drawing.Size(52, 25);
+            this.cmbWxCat.Size = new System.Drawing.Size(38, 25);
             this.cmbWxCat.TabIndex = 802;
             // 
             // txtSKC
@@ -1025,7 +1025,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtSKC.Location = new System.Drawing.Point(72, 41);
             this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSKC.Name = "txtSKC";
-            this.txtSKC.Size = new System.Drawing.Size(52, 23);
+            this.txtSKC.Size = new System.Drawing.Size(38, 23);
             this.txtSKC.TabIndex = 432;
             // 
             // cmbSort
@@ -1035,10 +1035,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
             "曝光量"});
-            this.cmbSort.Location = new System.Drawing.Point(399, 40);
+            this.cmbSort.Location = new System.Drawing.Point(357, 40);
             this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSort.Name = "cmbSort";
-            this.cmbSort.Size = new System.Drawing.Size(52, 25);
+            this.cmbSort.Size = new System.Drawing.Size(38, 25);
             this.cmbSort.TabIndex = 448;
             this.cmbSort.Text = "入库时间";
             // 
@@ -1046,7 +1046,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(355, 44);
+            this.label6.Location = new System.Drawing.Point(313, 44);
             this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(44, 17);
@@ -1057,30 +1057,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(355, 9);
+            this.label4.Location = new System.Drawing.Point(313, 9);
             this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(44, 17);
             this.label4.TabIndex = 430;
             this.label4.Text = "货号：";
             // 
-            // chkWXComplateProd
-            // 
-            this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.tableLayoutPanel1.SetColumnSpan(this.chkWXComplateProd, 2);
-            this.chkWXComplateProd.Location = new System.Drawing.Point(783, 77);
-            this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.chkWXComplateProd.Name = "chkWXComplateProd";
-            this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21);
-            this.chkWXComplateProd.TabIndex = 808;
-            this.chkWXComplateProd.Text = "微信回采商品";
-            this.chkWXComplateProd.UseVisualStyleBackColor = true;
-            // 
             // label12
             // 
             this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(583, 9);
+            this.label12.Location = new System.Drawing.Point(513, 9);
             this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(68, 17);
@@ -1090,17 +1078,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtExtCode
             // 
             this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCode.Location = new System.Drawing.Point(399, 6);
+            this.txtExtCode.Location = new System.Drawing.Point(357, 6);
             this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtExtCode.Name = "txtExtCode";
-            this.txtExtCode.Size = new System.Drawing.Size(52, 23);
+            this.txtExtCode.Size = new System.Drawing.Size(38, 23);
             this.txtExtCode.TabIndex = 429;
             // 
             // lblGroup
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(137, 44);
+            this.lblGroup.Location = new System.Drawing.Point(123, 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);
@@ -1111,10 +1099,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             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(181, 40);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(167, 40);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(52, 25);
+            this.cmbGroupFilter.Size = new System.Drawing.Size(38, 25);
             this.cmbGroupFilter.TabIndex = 653;
             // 
             // cmbExportToOutServer
@@ -1126,17 +1114,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "是",
             "否",
             "导出未拉回"});
-            this.cmbExportToOutServer.Location = new System.Drawing.Point(651, 40);
+            this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 40);
             this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbExportToOutServer.Name = "cmbExportToOutServer";
-            this.cmbExportToOutServer.Size = new System.Drawing.Size(52, 25);
+            this.cmbExportToOutServer.Size = new System.Drawing.Size(38, 25);
             this.cmbExportToOutServer.TabIndex = 803;
             // 
             // label3
             // 
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(457, 9);
+            this.label3.Location = new System.Drawing.Point(401, 9);
             this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(68, 17);
@@ -1146,10 +1134,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtProdName
             // 
             this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtProdName.Location = new System.Drawing.Point(525, 6);
+            this.txtProdName.Location = new System.Drawing.Point(469, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(52, 23);
+            this.txtProdName.Size = new System.Drawing.Size(38, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // cmbWxSafe
@@ -1162,10 +1150,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "安全商品",
             "违规商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(525, 40);
+            this.cmbWxSafe.Location = new System.Drawing.Point(469, 40);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(52, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(38, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
@@ -1173,7 +1161,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(457, 44);
+            this.lblWxSafe.Location = new System.Drawing.Point(401, 44);
             this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblWxSafe.Name = "lblWxSafe";
             this.lblWxSafe.Size = new System.Drawing.Size(68, 17);
@@ -1184,7 +1172,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblNotes.AutoSize = true;
-            this.lblNotes.Location = new System.Drawing.Point(137, 9);
+            this.lblNotes.Location = new System.Drawing.Point(123, 9);
             this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblNotes.Name = "lblNotes";
             this.lblNotes.Size = new System.Drawing.Size(44, 17);
@@ -1194,20 +1182,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtNotes
             // 
             this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtNotes.Location = new System.Drawing.Point(181, 6);
+            this.txtNotes.Location = new System.Drawing.Point(167, 6);
             this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtNotes.Name = "txtNotes";
-            this.txtNotes.Size = new System.Drawing.Size(52, 23);
+            this.txtNotes.Size = new System.Drawing.Size(38, 23);
             this.txtNotes.TabIndex = 439;
             // 
             // cmbCat1
             // 
             this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat1.FormattingEnabled = true;
-            this.cmbCat1.Location = new System.Drawing.Point(181, 75);
+            this.cmbCat1.Location = new System.Drawing.Point(167, 75);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(52, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(38, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged);
             // 
@@ -1215,7 +1203,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(130, 79);
+            this.label2.Location = new System.Drawing.Point(116, 79);
             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);
@@ -1226,10 +1214,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat3.FormattingEnabled = true;
-            this.cmbCat3.Location = new System.Drawing.Point(399, 75);
+            this.cmbCat3.Location = new System.Drawing.Point(357, 75);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(52, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(38, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged);
             // 
@@ -1237,7 +1225,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(348, 79);
+            this.label17.Location = new System.Drawing.Point(306, 79);
             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);
@@ -1250,7 +1238,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtRealCoid.Location = new System.Drawing.Point(72, 76);
             this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtRealCoid.Name = "txtRealCoid";
-            this.txtRealCoid.Size = new System.Drawing.Size(52, 23);
+            this.txtRealCoid.Size = new System.Drawing.Size(38, 23);
             this.txtRealCoid.TabIndex = 814;
             // 
             // btnEmpty
@@ -1259,7 +1247,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             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(835, 40);
+            this.btnEmpty.Location = new System.Drawing.Point(849, 40);
             this.btnEmpty.Name = "btnEmpty";
             this.btnEmpty.Size = new System.Drawing.Size(46, 25);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1285,7 +1273,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             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(835, 5);
+            this.btnSearch.Location = new System.Drawing.Point(849, 5);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(46, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1303,13 +1291,50 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSearch.Text = "搜索";
             this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
             // 
+            // label11
+            // 
+            this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(737, 9);
+            this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(68, 17);
+            this.label11.TabIndex = 651;
+            this.label11.Text = "商品类型：";
+            // 
+            // cmbSpProdType
+            // 
+            this.cmbSpProdType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbSpProdType.FormattingEnabled = true;
+            this.cmbSpProdType.Items.AddRange(new object[] {
+            "",
+            "普通商品",
+            "爆款数据"});
+            this.cmbSpProdType.Location = new System.Drawing.Point(805, 5);
+            this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbSpProdType.Name = "cmbSpProdType";
+            this.cmbSpProdType.Size = new System.Drawing.Size(38, 25);
+            this.cmbSpProdType.TabIndex = 677;
+            // 
+            // chkWXComplateProd
+            // 
+            this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.tableLayoutPanel1.SetColumnSpan(this.chkWXComplateProd, 2);
+            this.chkWXComplateProd.Location = new System.Drawing.Point(699, 77);
+            this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.chkWXComplateProd.Name = "chkWXComplateProd";
+            this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21);
+            this.chkWXComplateProd.TabIndex = 808;
+            this.chkWXComplateProd.Text = "微信回采商品";
+            this.chkWXComplateProd.UseVisualStyleBackColor = true;
+            // 
             // chkPullAfterPush
             // 
             this.chkPullAfterPush.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chkPullAfterPush.AutoSize = true;
             this.chkPullAfterPush.Checked = true;
             this.chkPullAfterPush.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkPullAfterPush.Location = new System.Drawing.Point(914, 59);
+            this.chkPullAfterPush.Location = new System.Drawing.Point(920, 59);
             this.chkPullAfterPush.Name = "chkPullAfterPush";
             this.chkPullAfterPush.Size = new System.Drawing.Size(99, 21);
             this.chkPullAfterPush.TabIndex = 874;
@@ -2027,7 +2052,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.ComboBox cmbHasReturn;
         private System.Windows.Forms.Label label18;
         private DevComponents.DotNetBar.PanelEx btnUpdateReturnServerData;
-        private UserComponent.UcCheckBox ucCheckBox1;
+        private UserComponent.UcCheckBox chkTime;
         private System.Windows.Forms.DateTimePicker dtpEnd;
         private System.Windows.Forms.DateTimePicker dtpStart;
         private DevComponents.DotNetBar.PanelEx panelEx1;
@@ -2074,5 +2099,7 @@ 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 System.Windows.Forms.TextBox txtViewUvMin;
+        private UserComponent.UcCheckBox chkViewUvMin;
     }
 }

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs

@@ -347,7 +347,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验") +
                     "&special_prod_type=" + (cmbSpProdType.Text.Trim().IsNullOrEmpty() ? "普通商品,书籍,爆款数据" : cmbSpProdType.Text.Trim().Replace("普通商品", "普通商品,书籍"));
 
-                if (ucCheckBox1.Checked)
+                if (chkViewUvMin.Checked)
+                {
+                    data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt();
+                }
+
+                if (chkTime.Checked)
                 {
                     data += "&start_time=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data += "&end_time=" + dtpEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");

TEMUKJD/WXForms/ProductForms/ActivityForms/WXActivity618Form.resx

@@ -0,0 +1,204 @@
+<?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="colGroup.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="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="colDraftId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuId.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="colProductName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSpec.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="colValidPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colStock.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/WXFinderSquareForm.Designer.cs

@@ -51,6 +51,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnClearFilter = new DevComponents.DotNetBar.PanelEx();
             this.btnSearchTalent = new DevComponents.DotNetBar.PanelEx();
             this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
+            this.label24 = new System.Windows.Forms.Label();
             this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx();
             this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx();
             this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx();
@@ -70,6 +72,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colApi = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -170,7 +173,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.splitContainer1.Panel2.Controls.Add(this.pbLoadingShop);
             this.splitContainer1.Panel2.Controls.Add(this.dgvShop);
             this.splitContainer1.Panel2.Padding = new System.Windows.Forms.Padding(4, 0, 0, 4);
-            this.splitContainer1.Size = new System.Drawing.Size(350, 611);
+            this.splitContainer1.Size = new System.Drawing.Size(365, 611);
             this.splitContainer1.SplitterDistance = 165;
             this.splitContainer1.TabIndex = 11;
             // 
@@ -189,9 +192,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.Controls.Add(this.label2);
             this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter);
             this.ucGroupBoxEx4.Controls.Add(this.btnSearchTalent);
-            this.ucGroupBoxEx4.Location = new System.Drawing.Point(162, 2);
+            this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2);
             this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
-            this.ucGroupBoxEx4.Size = new System.Drawing.Size(190, 165);
+            this.ucGroupBoxEx4.Size = new System.Drawing.Size(181, 165);
             this.ucGroupBoxEx4.TabIndex = 666;
             this.ucGroupBoxEx4.TabStop = false;
             this.ucGroupBoxEx4.Text = "达人查询";
@@ -200,18 +203,18 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label5.AutoSize = true;
             this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.label5.Location = new System.Drawing.Point(44, 22);
+            this.label5.Location = new System.Drawing.Point(36, 22);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(140, 34);
             this.label5.TabIndex = 818;
-            this.label5.Text = "达人广场页面上选好查询\r\n条件后点击达人查询按钮";
+            this.label5.Text = "达人广场页面上选好查询\r\n条件后点击达人搜索按钮";
             // 
             // textBox1
             // 
             this.textBox1.Font = new System.Drawing.Font("微软雅黑", 10F);
             this.textBox1.ForeColor = System.Drawing.Color.Red;
-            this.textBox1.Location = new System.Drawing.Point(65, 64);
+            this.textBox1.Location = new System.Drawing.Point(59, 64);
             this.textBox1.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(114, 25);
@@ -220,7 +223,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(9, 68);
+            this.label3.Location = new System.Drawing.Point(4, 68);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label3.Name = "label3";
             this.label3.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -231,7 +234,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtPageEnd
             // 
             this.txtPageEnd.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtPageEnd.Location = new System.Drawing.Point(65, 94);
+            this.txtPageEnd.Location = new System.Drawing.Point(59, 94);
             this.txtPageEnd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtPageEnd.Name = "txtPageEnd";
             this.txtPageEnd.Size = new System.Drawing.Size(114, 25);
@@ -242,7 +245,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(9, 98);
+            this.label1.Location = new System.Drawing.Point(4, 98);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label1.Name = "label1";
             this.label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
@@ -256,7 +259,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStop.Location = new System.Drawing.Point(123, 127);
+            this.btnStop.Location = new System.Drawing.Point(118, 127);
             this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnStop.Name = "btnStop";
             this.btnStop.Size = new System.Drawing.Size(56, 25);
@@ -279,7 +282,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(9, 22);
+            this.label2.Location = new System.Drawing.Point(3, 22);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(44, 17);
@@ -292,7 +295,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(12, 127);
+            this.btnClearFilter.Location = new System.Drawing.Point(7, 127);
             this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearFilter.Name = "btnClearFilter";
             this.btnClearFilter.Size = new System.Drawing.Size(41, 25);
@@ -320,7 +323,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSearchTalent.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearchTalent.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearchTalent.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearchTalent.Location = new System.Drawing.Point(65, 127);
+            this.btnSearchTalent.Location = new System.Drawing.Point(60, 127);
             this.btnSearchTalent.Name = "btnSearchTalent";
             this.btnSearchTalent.Size = new System.Drawing.Size(56, 25);
             this.btnSearchTalent.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -344,6 +347,8 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup);
+            this.ucGroupBoxEx1.Controls.Add(this.label24);
             this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline);
             this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline);
             this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect);
@@ -358,10 +363,33 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx1.Controls.Add(this.label17);
             this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
             this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
-            this.ucGroupBoxEx1.Size = new System.Drawing.Size(160, 165);
+            this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165);
             this.ucGroupBoxEx1.TabIndex = 399;
             this.ucGroupBoxEx1.TabStop = false;
-            this.ucGroupBoxEx1.Text = "基础";
+            this.ucGroupBoxEx1.Text = "店铺筛选";
+            // 
+            // cmbFilterShopGroup
+            // 
+            this.cmbFilterShopGroup.DefaultText = "全部";
+            this.cmbFilterShopGroup.DropDownHeight = 1;
+            this.cmbFilterShopGroup.DropDownWidth = 1;
+            this.cmbFilterShopGroup.FormattingEnabled = true;
+            this.cmbFilterShopGroup.IntegralHeight = false;
+            this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92);
+            this.cmbFilterShopGroup.Name = "cmbFilterShopGroup";
+            this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25);
+            this.cmbFilterShopGroup.TabIndex = 836;
+            this.cmbFilterShopGroup.Text = "全部";
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(7, 96);
+            this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(32, 17);
+            this.label24.TabIndex = 837;
+            this.label24.Text = "分组";
             // 
             // btnSelectOffline
             // 
@@ -369,9 +397,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectOffline.Location = new System.Drawing.Point(61, 137);
+            this.btnSelectOffline.Location = new System.Drawing.Point(59, 139);
             this.btnSelectOffline.Name = "btnSelectOffline";
-            this.btnSelectOffline.Size = new System.Drawing.Size(50, 20);
+            this.btnSelectOffline.Size = new System.Drawing.Size(48, 18);
             this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -393,9 +421,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectOnline.Location = new System.Drawing.Point(9, 137);
+            this.btnSelectOnline.Location = new System.Drawing.Point(9, 139);
             this.btnSelectOnline.Name = "btnSelectOnline";
-            this.btnSelectOnline.Size = new System.Drawing.Size(50, 20);
+            this.btnSelectOnline.Size = new System.Drawing.Size(48, 18);
             this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -417,9 +445,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115);
+            this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119);
             this.btnAddUnSelect.Name = "btnAddUnSelect";
-            this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20);
+            this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18);
             this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -441,9 +469,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReverse.Location = new System.Drawing.Point(113, 137);
+            this.btnReverse.Location = new System.Drawing.Point(109, 139);
             this.btnReverse.Name = "btnReverse";
-            this.btnReverse.Size = new System.Drawing.Size(38, 20);
+            this.btnReverse.Size = new System.Drawing.Size(32, 18);
             this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -466,9 +494,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbFilterShopNotes.DropDownWidth = 1;
             this.cmbFilterShopNotes.FormattingEnabled = true;
             this.cmbFilterShopNotes.IntegralHeight = false;
-            this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66);
+            this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65);
             this.cmbFilterShopNotes.Name = "cmbFilterShopNotes";
-            this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25);
+            this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25);
             this.cmbFilterShopNotes.TabIndex = 442;
             this.cmbFilterShopNotes.Text = "全部";
             // 
@@ -478,9 +506,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddSelect.Location = new System.Drawing.Point(9, 115);
+            this.btnAddSelect.Location = new System.Drawing.Point(9, 119);
             this.btnAddSelect.Name = "btnAddSelect";
-            this.btnAddSelect.Size = new System.Drawing.Size(70, 20);
+            this.btnAddSelect.Size = new System.Drawing.Size(65, 18);
             this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -501,10 +529,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmptyShop.Location = new System.Drawing.Point(113, 93);
+            this.btnEmptyShop.Location = new System.Drawing.Point(143, 139);
             this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnEmptyShop.Name = "btnEmptyShop";
-            this.btnEmptyShop.Size = new System.Drawing.Size(38, 20);
+            this.btnEmptyShop.Size = new System.Drawing.Size(32, 18);
             this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
             this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -527,9 +555,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnFilterShop.Location = new System.Drawing.Point(9, 93);
+            this.btnFilterShop.Location = new System.Drawing.Point(143, 119);
             this.btnFilterShop.Name = "btnFilterShop";
-            this.btnFilterShop.Size = new System.Drawing.Size(102, 20);
+            this.btnFilterShop.Size = new System.Drawing.Size(32, 18);
             this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -542,13 +570,13 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnFilterShop.TabIndex = 703;
-            this.btnFilterShop.Text = "过滤店铺";
+            this.btnFilterShop.Text = "过滤";
             this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click);
             // 
             // label16
             // 
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(7, 70);
+            this.label16.Location = new System.Drawing.Point(7, 69);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(32, 17);
@@ -558,10 +586,10 @@ namespace TemuKJD.WXForms.ProductForms
             // txtFilterShopName
             // 
             this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtFilterShopName.Location = new System.Drawing.Point(38, 39);
+            this.txtFilterShopName.Location = new System.Drawing.Point(38, 38);
             this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtFilterShopName.Name = "txtFilterShopName";
-            this.txtFilterShopName.Size = new System.Drawing.Size(113, 25);
+            this.txtFilterShopName.Size = new System.Drawing.Size(137, 25);
             this.txtFilterShopName.TabIndex = 653;
             // 
             // btnRefreshShop
@@ -570,9 +598,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefreshShop.Location = new System.Drawing.Point(9, 17);
+            this.btnRefreshShop.Location = new System.Drawing.Point(9, 18);
             this.btnRefreshShop.Name = "btnRefreshShop";
-            this.btnRefreshShop.Size = new System.Drawing.Size(142, 20);
+            this.btnRefreshShop.Size = new System.Drawing.Size(166, 18);
             this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -591,7 +619,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(7, 43);
+            this.label17.Location = new System.Drawing.Point(7, 42);
             this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(32, 17);
@@ -602,7 +630,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoadingShop.Location = new System.Drawing.Point(152, 194);
+            this.pbLoadingShop.Location = new System.Drawing.Point(159, 194);
             this.pbLoadingShop.Name = "pbLoadingShop";
             this.pbLoadingShop.Size = new System.Drawing.Size(50, 50);
             this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -634,6 +662,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopId,
             this.colShopName,
             this.colShopNotes,
+            this.colGroup,
             this.colSelectProduct,
             this.colLoginStatus,
             this.colApi,
@@ -649,7 +678,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvShop.ReadOnly = true;
             this.dgvShop.RowHeadersWidth = 25;
             this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(346, 438);
+            this.dgvShop.Size = new System.Drawing.Size(361, 438);
             this.dgvShop.TabIndex = 6;
             this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
             this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
@@ -692,7 +721,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopNotes.HeaderText = "备注";
             this.colShopNotes.Name = "colShopNotes";
             this.colShopNotes.ReadOnly = true;
-            this.colShopNotes.Width = 75;
+            this.colShopNotes.Width = 66;
+            // 
+            // colGroup
+            // 
+            this.colGroup.HeaderText = "分组";
+            this.colGroup.Name = "colGroup";
+            this.colGroup.ReadOnly = true;
+            this.colGroup.Width = 66;
             // 
             // colSelectProduct
             // 
@@ -804,7 +840,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvTalent.Name = "dgvTalent";
             this.dgvTalent.ReadOnly = true;
             this.dgvTalent.RowTemplate.Height = 23;
-            this.dgvTalent.Size = new System.Drawing.Size(986, 438);
+            this.dgvTalent.Size = new System.Drawing.Size(971, 438);
             this.dgvTalent.TabIndex = 187;
             this.dgvTalent.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvTalent_CellContentClick);
             // 
@@ -982,7 +1018,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.splitContainer2.Panel2.Controls.Add(this.ucTabControl1);
             this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload);
             this.splitContainer2.Size = new System.Drawing.Size(1346, 611);
-            this.splitContainer2.SplitterDistance = 350;
+            this.splitContainer2.SplitterDistance = 365;
             this.splitContainer2.TabIndex = 0;
             // 
             // ucTabControl1
@@ -996,7 +1032,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucTabControl1.Name = "ucTabControl1";
             this.ucTabControl1.SelectedIndex = 0;
             this.ucTabControl1.ShowCloseButton = false;
-            this.ucTabControl1.Size = new System.Drawing.Size(992, 611);
+            this.ucTabControl1.Size = new System.Drawing.Size(977, 611);
             this.ucTabControl1.TabIndex = 780;
             this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1007,7 +1043,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.tabPage1.Controls.Add(this.mainPanel);
             this.tabPage1.Location = new System.Drawing.Point(2, 32);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Size = new System.Drawing.Size(986, 575);
+            this.tabPage1.Size = new System.Drawing.Size(971, 575);
             this.tabPage1.TabIndex = 1;
             this.tabPage1.Text = "达人广场";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -1017,7 +1053,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.mainPanel.Location = new System.Drawing.Point(0, 0);
             this.mainPanel.Name = "mainPanel";
-            this.mainPanel.Size = new System.Drawing.Size(986, 575);
+            this.mainPanel.Size = new System.Drawing.Size(971, 575);
             this.mainPanel.TabIndex = 1;
             // 
             // tabPage2
@@ -1025,7 +1061,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.tabPage2.Controls.Add(this.splitContainer5);
             this.tabPage2.Location = new System.Drawing.Point(2, 32);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Size = new System.Drawing.Size(986, 575);
+            this.tabPage2.Size = new System.Drawing.Size(971, 575);
             this.tabPage2.TabIndex = 2;
             this.tabPage2.Text = "操作列表";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -1060,7 +1096,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.splitContainer5.Panel2.Controls.Add(this.pbLoading);
             this.splitContainer5.Panel2.Controls.Add(this.dgvTalent);
-            this.splitContainer5.Size = new System.Drawing.Size(986, 575);
+            this.splitContainer5.Size = new System.Drawing.Size(971, 575);
             this.splitContainer5.SplitterDistance = 133;
             this.splitContainer5.TabIndex = 0;
             // 
@@ -1083,7 +1119,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnStop2.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnStop2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnStop2.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStop2.Location = new System.Drawing.Point(913, 97);
+            this.btnStop2.Location = new System.Drawing.Point(898, 97);
             this.btnStop2.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnStop2.Name = "btnStop2";
             this.btnStop2.Size = new System.Drawing.Size(56, 25);
@@ -1110,7 +1146,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddFinder.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddFinder.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddFinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddFinder.Location = new System.Drawing.Point(827, 97);
+            this.btnAddFinder.Location = new System.Drawing.Point(812, 97);
             this.btnAddFinder.Name = "btnAddFinder";
             this.btnAddFinder.Size = new System.Drawing.Size(84, 25);
             this.btnAddFinder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1147,7 +1183,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtProductIds.Location = new System.Drawing.Point(630, 9);
             this.txtProductIds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtProductIds.Name = "txtProductIds";
-            this.txtProductIds.Size = new System.Drawing.Size(341, 25);
+            this.txtProductIds.Size = new System.Drawing.Size(326, 25);
             this.txtProductIds.TabIndex = 849;
             // 
             // label9
@@ -1250,7 +1286,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(468, 194);
+            this.pbLoading.Location = new System.Drawing.Point(460, 194);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1368,19 +1404,6 @@ namespace TemuKJD.WXForms.ProductForms
         private DevComponents.DotNetBar.PanelEx btnAddSelect;
         private DevComponents.DotNetBar.PanelEx btnSelectOffline;
         private DevComponents.DotNetBar.PanelEx btnSelectOnline;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
-        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
-        private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
-        private System.Windows.Forms.DataGridViewLinkColumn colApi;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
         private System.Windows.Forms.Label label2;
         private DevComponents.DotNetBar.PanelEx btnStop;
         private System.Windows.Forms.Label label5;
@@ -1427,5 +1450,21 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
         private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
         private UserComponent.UcCheckBox chkReUse;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
+        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
+        private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
+        private System.Windows.Forms.DataGridViewLinkColumn colApi;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
+        private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup;
+        private System.Windows.Forms.Label label24;
     }
 }

TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.cs

@@ -42,9 +42,6 @@ namespace TemuKJD.WXForms.ProductForms
         public CancellationTokenSource cancellationTokenSource { get; set; } = null;
         public bool IsLoadComplate { get; set; } = false;
 
-        public ConcurrentList<WXShopTokenInfo> lstWXShopTokenInfo = new ConcurrentList<WXShopTokenInfo>();
-        public Dictionary<string, WxShopUploadInfo> dicShopUpload = new Dictionary<string, WxShopUploadInfo>();
-
         WXAddFinderParam wxAddFinderParam = new WXAddFinderParam();
 
         ChromiumWebBrowser mainWebBrowser = null;
@@ -65,11 +62,6 @@ namespace TemuKJD.WXForms.ProductForms
         {
             this.splitContainer1.Dock = DockStyle.Fill;
 
-            // 授权Token
-            lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list");
-            if (lstWXShopTokenInfo == null)
-                lstWXShopTokenInfo = new ConcurrentList<WXShopTokenInfo>();
-
             // 选中信息
             //dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig<Dictionary<string, bool>>("wx_checked_shop_dic");
             //if (dicCheckedShopId == null)
@@ -246,6 +238,11 @@ namespace TemuKJD.WXForms.ProductForms
             {
                 cmbFilterShopNotes.Items.Add(note);
             }
+            cmbFilterShopGroup.Items.Clear();
+            foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
+            {
+                cmbFilterShopGroup.Items.Add(group);
+            }
             pbLoadingShop.Visible = false;
         }
 
@@ -270,14 +267,13 @@ namespace TemuKJD.WXForms.ProductForms
                     shopEntity.ShopId,
                     shopEntity.ShopAccount,
                     shopEntity.Notes,
+                    shopEntity.GroupName,
                     "选择商品",
                     canUse ? "在线" : "掉线",
                     GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期",
                     canUse,
-                    dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ?
-                        dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0,
-                    dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ?
-                        dicShopUpload[shopEntity.ShopId].OnSaleCount : 0,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0,
                     shopEntity.AddProductRemaining,
                     msg
                 );
@@ -293,10 +289,8 @@ namespace TemuKJD.WXForms.ProductForms
                 row.Cells["colCanUse"].Value = canUse;
                 row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期";
                 row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
-                row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ?
-                    dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0;
-                row.Cells["colOnSaleNum"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ?
-                    dicShopUpload[shopEntity.ShopId].OnSaleCount : 0;
+                row.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0;
+                row.Cells["colOnSaleNum"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0;
                 row.Cells["colMessage"].Value = msg;
             }
 
@@ -665,13 +659,18 @@ namespace TemuKJD.WXForms.ProductForms
 
         private void btnFilterShop_Click(object sender, EventArgs e)
         {
+            string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
+            if (notes == "全部")
+                notes = "";
+            List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
             foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
-                if (notes == "全部")
-                    notes = "";
-                List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
-
                 if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
                 {
                     row.Visible = false;
@@ -684,6 +683,12 @@ namespace TemuKJD.WXForms.ProductForms
                     row.Cells["colSelect"].Value = false;
                     continue;
                 }
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                {
+                    row.Visible = false;
+                    row.Cells["colSelect"].Value = false;
+                    continue;
+                }
                 row.Visible = true;
             }
         }
@@ -692,6 +697,7 @@ namespace TemuKJD.WXForms.ProductForms
         {
             txtFilterShopName.Text = "";
             cmbFilterShopNotes.Text = "全部";
+            cmbFilterShopGroup.Text = "全部";
             btnFilterShop_Click(null, null);
         }
 
@@ -711,16 +717,24 @@ namespace TemuKJD.WXForms.ProductForms
                 notes = "";
             List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
             foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                if (row.Visible == true)
-                {
-                    if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
-                        (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())))
-                    {
-                        row.Cells["colSelect"].Value = true;
-                    }
-                }
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = true;
             }
         }
 
@@ -731,16 +745,24 @@ namespace TemuKJD.WXForms.ProductForms
                 notes = "";
             List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
             foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                if (row.Visible == true)
-                {
-                    if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
-                        (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())))
-                    {
-                        row.Cells["colSelect"].Value = false;
-                    }
-                }
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = false;
             }
         }
 

TEMUKJD/WXForms/ProductForms/WXFinderSquareForm.resx

@@ -129,6 +129,9 @@
   <metadata name="colShopNotes.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="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/WXForms/ProductForms/WXOrderConsignmentForm.cs

@@ -0,0 +1,993 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.Result;
+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.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.Extension;
+using TemuKJD.BaseForms;
+using TemuKJD.ToolForms;
+using Work;
+using TemuKJD.BLL;
+using System.Text.RegularExpressions;
+using TemuKJD.PDDForms.ProductSelectForms;
+using TemuKJD.WXForms.ShopForms;
+using AllBase.Model.Result.PDDResult;
+using AllBase.Model.Param.WXParam;
+using AllBase.Model.Result.WXResult;
+using Newtonsoft.Json;
+using NaiBa.Util;
+using AllBase.Model.Config;
+using TemuKJD.BLL.Wx;
+
+namespace TemuKJD.WXForms.ProductForms
+{
+    public partial class WXOrderConsignmentForm : BaseForm
+    {
+        int PageBegin = 1;
+        int PageEnd = 1000;
+        string OnSaleStatus = "在售";
+
+        public CancellationTokenSource cancellationTokenSource { get; set; } = null;
+        public bool IsLoadComplate { get; set; } = false;
+
+        bool isInit = false;
+        CheckBox chkSelectAll = null;
+        ConcurrentList<WxConsignmentOrderInfo> lstWXConsignmentOrderInfo = new ConcurrentList<WxConsignmentOrderInfo>();
+        public Dictionary<string, bool> dicCheckedShopId = new Dictionary<string, bool>();
+        public WXOrderConsignmentForm()
+        {
+            InitializeComponent();
+        }
+
+        private void UserSelectDbProductForm_Load(object sender, EventArgs e)
+        {
+            this.splitContainer1.Dock = DockStyle.Fill;
+
+            dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig<Dictionary<string, bool>>("wx_checked_shop_dic");
+            if (dicCheckedShopId == null)
+                dicCheckedShopId = new Dictionary<string, bool>();
+
+            chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
+            dgvShop.Columns["colSelect"].HeaderText = "";
+            chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
+
+            this.dgvSelectProduct.AddSelectorColumn("colCheck");
+
+            dgvSelectProduct.AddImgColumn("colProductSkcPic", "colImgUrl");
+
+            IsLoadComplate = true;
+        }
+
+        private void chkSelectAll_CheckedChanged(object sender, EventArgs e)
+        {
+            if (!chkSelectAll.Checked)
+            {
+                foreach (DataGridViewRow row in dgvShop.Rows)
+                {
+                    row.Cells["colSelect"].Value = false;
+                }
+            }
+            else
+            {
+                //var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId);
+                foreach (DataGridViewRow row in dgvShop.Rows)
+                {
+                    //if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString()))
+                    if (row.Visible == true)
+                        row.Cells["colSelect"].Value = true;
+                }
+            }
+
+            foreach (var r in dgvShop.Rows.Cast<DataGridViewRow>())
+            {
+                dicCheckedShopId[r.Cells["colShopId"].Value.ParseToString()] = r.Cells["colSelect"].Value.ParseToBool();
+            }
+            NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_checked_shop_dic", dicCheckedShopId);
+        }
+
+        private void btnRefreshShop_Click(object sender, EventArgs e)
+        {
+            pbLoadingShop.Visible = true;
+            RefreshShopLogin();
+            pbLoadingShop.Visible = false;
+        }
+
+        private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e)
+        {
+            if (Visible == true)
+            {
+                RefreshShopLogin();
+                //updateAuthor();
+
+                if (!isInit)
+                {
+                }
+
+                isInit = true;
+            }
+        }
+
+        private void RefreshShopLogin()
+        {
+            // 店铺Id
+            var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
+            // 获取被删除的店铺
+            List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
+            // 更新被删除的店铺列表
+            foreach (var row in dgvRowList)
+            {
+                dgvShop.Rows.Remove(row);
+            }
+            // 绑定其他店铺（含新导入的店铺）
+            foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
+            {
+                if (!string.IsNullOrEmpty(shopEntity.ShopId))
+                    BindShop(shopEntity, selectIds);
+            }
+            cmbFilterShopNotes.Items.Clear();
+            foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
+            {
+                cmbFilterShopNotes.Items.Add(note);
+            }
+            cmbFilterShopGroup.Items.Clear();
+            foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
+            {
+                cmbFilterShopGroup.Items.Add(note);
+            }
+        }
+
+        private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null, string msg = "")
+        {
+            if (shopEntity == null)
+                return;
+            if (shopEntity.is_shop_expire)
+                return;
+            if (selectShopId == null)
+                selectShopId = new List<string>();
+
+            bool canUse = shopEntity.LoginStatus == "登录成功";
+            var rows = dgvShop.Rows.Cast<DataGridViewRow>().Where(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId).ToList();
+            var day = DateTime.Now.ToString("yyyyMMdd").ParseToInt();
+            if (rows.Count == 0)
+            {
+                this.dgvShop.Rows.Add(
+                    dicCheckedShopId.Keys.Contains(shopEntity.ShopId) && dicCheckedShopId[shopEntity.ShopId] == true,
+                    shopEntity.LoginName,
+                    shopEntity.ShopId,
+                    shopEntity.ShopAccount,
+                    shopEntity.Notes,
+                    shopEntity.GroupName,
+                    "选择商品",
+                    canUse ? "在线" : "掉线",
+                    GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期",
+                    canUse,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0,
+                    shopEntity.AddProductRemaining,
+                    msg
+                );
+            }
+            else
+            {
+                foreach (var row in rows)
+                {
+                    row.Cells["colSelect"].Value = !isInit || (selectShopId.Contains(shopEntity.ShopId) && canUse);
+                    row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
+                    row.Cells["colShopName"].Value = shopEntity.ShopAccount;
+                    row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                    row.Cells["colGroup"].Value = shopEntity.GroupName;
+                    row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                    row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
+                    row.Cells["colCanUse"].Value = canUse;
+                    row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期";
+                    row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
+                    row.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0;
+                    row.Cells["colOnSaleNum"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0;
+                    row.Cells["colMessage"].Value = msg;
+                }
+            }
+
+            displayAuthStatus(shopEntity);
+        }
+
+        void displayAuthStatus(ShopLoginInfo shop)
+        {
+            var rows = this.dgvShop.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colShopId"].Value.ParseToString() == shop?.ShopId);
+            foreach (var row in rows)
+            {
+                bool canUse = row.Cells["colLoginStatus"].Value.ParseToString() == "在线";
+                (row.Cells["colLoginStatus"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Blue : Color.Red;
+                (row.Cells["colLoginStatus"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Blue : Color.Red;
+                (row.Cells["colLoginStatus"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightBlue : Color.OrangeRed;
+                (row.Cells["colLoginStatus"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkBlue : Color.DarkRed;
+                canUse = row.Cells["colApi"].Value.ParseToString() == "可用";
+                (row.Cells["colApi"] as DataGridViewLinkCell).Style.ForeColor = canUse ? Color.Blue : Color.Red;
+                (row.Cells["colApi"] as DataGridViewLinkCell).LinkColor = canUse ? Color.Blue : Color.Red;
+                (row.Cells["colApi"] as DataGridViewLinkCell).ActiveLinkColor = canUse ? Color.LightBlue : Color.OrangeRed;
+                (row.Cells["colApi"] as DataGridViewLinkCell).VisitedLinkColor = canUse ? Color.DarkBlue : Color.DarkRed;
+            }
+        }
+
+        private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvShop.Columns[e.ColumnIndex].Name;
+            string shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString();
+            string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString();
+            var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString());
+            var row = dgvShop.Rows[e.RowIndex];
+            switch (columnName)
+            {
+                case "colSelect":
+                    //if (row.Cells["colCanUse"].Value.ParseToBool())
+                    {
+                        row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool();
+
+                        chkSelectAll.CheckedChanged -= chkSelectAll_CheckedChanged;
+                        if (dgvShop.Rows.Cast<DataGridViewRow>().All(r => r.Cells["colSelect"].Value.ParseToBool()))
+                            chkSelectAll.Checked = true;
+                        else
+                            chkSelectAll.Checked = false;
+                        chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
+                    }
+                    //else
+                    {
+                        //BaseMsgForm.ShowInfo("店铺未登录！");
+                    }
+
+                    dicCheckedShopId[row.Cells["colShopId"].Value.ParseToString()] = row.Cells["colSelect"].Value.ParseToBool();
+                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_checked_shop_dic", dicCheckedShopId);
+                    break;
+                case "colLoginStatus":
+                    {
+                        if (WXShopListForm.Instance == null)
+                            WXShopListForm.Instance = new WXShopListForm();
+                        WXShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
+                        WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+                        //shopLoginForm.prodUserSelectForm = this;
+                        if (shop.LoginStatus != "登录成功")
+                        {
+                            shopLoginForm.openType = EnumOpenType.login;
+                            shopLoginForm.ShowDialog();
+                            RefreshShopLogin();
+                        }
+                        else
+                        {
+                            shopLoginForm.openType = EnumOpenType.manage;
+                            shopLoginForm.WindowState = FormWindowState.Maximized;
+                            shopLoginForm.Show();
+                        }
+                    }
+                    break;
+                case "colApi":
+                    {
+                        WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+                        shopLoginForm.openType = EnumOpenType.manage;
+                        shopLoginForm.WindowState = FormWindowState.Maximized;
+                        shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=3984039898079707139";
+                        shopLoginForm.Show();
+                    }
+                    break;
+            }
+        }
+
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            var lstShopId = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
+            if (lstShopId.Count == 0)
+            {
+                BaseMsgForm.ShowInfo("请选择店铺！");
+                return;
+            }
+        }
+
+        private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText;
+            var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
+            var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
+            var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
+
+            switch (headerText)
+            {
+                case "删除":
+                    break;
+                case "登录":
+                    {
+                        WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+                        shopLoginForm.openType = EnumOpenType.login;
+                        shopLoginForm.ShowDialog();
+                        RefreshShopLogin();
+                    }
+                    break;
+                case "进店":
+                    {
+                        WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
+                        WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                        if (shop.LoginStatus == "登录成功")
+                        {
+                            shopLoginForm.openType = EnumOpenType.manage;
+                            shopLoginForm.WindowState = FormWindowState.Maximized;
+                            //shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/home";
+                            shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/order/consignment";
+                            shopLoginForm.Show();
+                        }
+                        else
+                        {
+                            shopLoginForm.openType = EnumOpenType.login;
+                            shopLoginForm.ShowDialog();
+                            RefreshShopLogin();
+                        }
+                    }
+                    break;
+                case "图片":
+                    {
+                        ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                        imgFrom.ShowDialog();
+                        break;
+                    }
+                case "操作":
+                    {
+                        if (BaseMsgForm.ShowConfirm("确认要取消分配吗？取消分配后，订单将回到待分配状态").DialogResult != DialogResult.OK)
+                            return;
+                        this.pbLoading.Visible = true;
+                        Task.Run(() =>
+                        {
+                            CancelConsignment(new List<DataGridViewRow>() { dgvSelectProduct.Rows[e.RowIndex] });
+                            Invoke(new Action(() =>
+                            {
+                                this.pbLoading.Visible = false;
+                            }));
+                        }, cancellationTokenSource.Token);
+                        break;
+                    }
+                case "":
+                    dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void btnStop_Click(object sender, EventArgs e)
+        {
+            if (this.cancellationTokenSource != null)
+                this.cancellationTokenSource.Cancel();
+        }
+
+        private void btnSearchProd_Click(object sender, EventArgs e)
+        {
+            var shopIdLst = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                  => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
+            if (shopIdLst.Count <= 0)
+            {
+                BaseMsgForm.ShowError("未勾选查询店铺！");
+                return;
+            }
+            btnSearchOrder.Enabled = false;
+            pbLoading.Visible = true;
+            if (cancellationTokenSource != null)
+                cancellationTokenSource.Cancel();
+            cancellationTokenSource = new CancellationTokenSource();
+            dgvSelectProduct.Rows.Clear();
+            Task.Run(() =>
+            {
+                GetConsignmentOrder(shopIdLst);
+                Invoke(new Action(() =>
+                {
+                    if (cancellationTokenSource.IsCancellationRequested)
+                    {
+                        this.statusBar.lblTaskStatus.Text = "订单查询停止";
+                        BaseMsgForm.ShowInfo("订单查询停止");
+                    }
+                    else
+                    {
+                        this.statusBar.lblTaskStatus.Text = "订单查询完毕";
+                        BaseMsgForm.ShowInfo("订单查询完毕");
+                    }
+                    pbLoading.Visible = false;
+                    btnSearchOrder.Enabled = true;
+                }));
+            }, cancellationTokenSource.Token);
+        }
+
+        void GetConsignmentOrder(List<string> shopIdLst)
+        {
+            List<ShopLoginInfo> shopLst = GlobalConfig.ShopLoginList.Where(s => shopIdLst.Contains(s.ShopId)).ToList();
+
+            Invoke(new Action(() =>
+            {
+                this.pbLoading.Visible = true;
+                this.statusBar.lblTaskStatus.Text = "正在查询店铺";
+                this.statusBar.pgbTaskProgress.Maximum = shopIdLst.Count;
+                this.statusBar.UpdateProgressBar(0);
+            }));
+
+            foreach (var shop in shopLst)
+            {
+                if (cancellationTokenSource.IsCancellationRequested)
+                    break;
+
+                Invoke(new Action(() =>
+                {
+                    this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1);
+                }));
+
+                if (shop.LoginStatus != "登录成功")
+                {
+                    continue;
+                }
+
+                var onRst = WXOrderConsignment.getConsignmentOnOffStatus(shop);
+                if (!onRst.Contains("\"isOpen\":true}"))
+                    continue;
+
+                int page = PageBegin - 1;
+                int totalPage = 1;
+                int pageSize = 30;
+                while (page < totalPage && page < PageEnd)
+                {
+                    page++;
+
+                    if (cancellationTokenSource.IsCancellationRequested)
+                        break;
+
+                    // 查找订单
+                    pageSize = 30;
+                    var result = WXOrderConsignment.searchConsignmentOrder(shop, page, pageSize, rbWaitDivide.Checked);
+                    if (!result.Contains("\"code\":0"))
+                    {
+                        ShowShopError(shop, result);
+                        break;
+                    }
+                    totalPage = Math.Ceiling(BaseRegex.GetIntJson(ref result, "totalCount") * 1m / pageSize).ParseToInt();
+                    List<WxConsignmentOrderInfo> consignmentOrderLst = new List<WxConsignmentOrderInfo>();
+                    try
+                    {
+                        var jArr = JsonHelper.JObjectParse(result)["orderList"];
+                        consignmentOrderLst = JsonHelper.DeserializeJsonToList<WxConsignmentOrderInfo>(JsonHelper.SerializeObject(jArr));
+                    }
+                    catch (Exception ex)
+                    {
+                        ShowShopError(shop, ex.Message);
+                        break;
+                    }
+                    Thread.Sleep(Randomx.GetId(200, 1000));
+
+                    // 查找对应商品
+                    string getProdOnSaleRst = "";
+                    if (consignmentOrderLst.Count > 0 && consignmentOrderLst.All(c => !c.commonInfo.cosignmentOrderId.IsNullOrEmpty()))
+                    {
+                        int onSaleStatusCode = -1;
+                        if (OnSaleStatus == "在售")
+                            onSaleStatusCode = 5;
+                        else if (OnSaleStatus == "下架")
+                            onSaleStatusCode = 11;
+                        else if (OnSaleStatus == "审核待处理")
+                            onSaleStatusCode = 3;
+                        else if (OnSaleStatus == "草稿箱")
+                            onSaleStatusCode = 1;
+                        else if (OnSaleStatus == "回收站")
+                            onSaleStatusCode = 6;
+                        pageSize = 50;
+                        string spuIds = string.Join(",", consignmentOrderLst.Select(r => string.Join(",", r.productsList.Select(p => p.productId))));
+                        getProdOnSaleRst = WXClearNoVisit.searchProduct(shop, 1, pageSize, spuIds, onSaleStatusCode);
+                        Thread.Sleep(Randomx.GetId(50, 100));
+                        if (!getProdOnSaleRst.Contains("\"success\":true"))
+                        {
+                            ShowShopError(shop, getProdOnSaleRst);
+                            break;
+                        }
+                    }
+
+                    try
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            this.pbLoading.Visible = true;
+                            this.statusBar.lblTaskStatus.Text = "正在查询店铺：" + shop.ShopAccount + " " + page + "/" + Math.Min(PageEnd, totalPage);
+                        }));
+                        var prodObjs = JsonHelper.JObjectParse(getProdOnSaleRst);
+                        foreach (var order in consignmentOrderLst)
+                        {
+                            foreach (var prodLite in order.productsList)
+                            {
+                                Invoke(new Action(() =>
+                                {
+                                    var spuCode = prodLite.spuCode;
+                                    var prod = prodObjs["productList"].FirstOrDefault(p => p["productId"].ParseToString() == prodLite.productId);
+                                    if (prod != null)
+                                    {
+                                        var pStr = JsonHelper.SerializeObject(prod);
+                                        spuCode = prod["spuCode"].ParseToString();
+                                    }
+
+                                    var rowIndex = this.dgvSelectProduct.Rows.Add(
+                                        false,
+                                        shop.ShopId,
+                                        shop.ShopAccount,
+                                        "登录",
+                                        "进店",
+                                        order.commonInfo.cosignmentOrderId,
+                                        order.commonInfo.supplierName,
+                                        order.commonInfo.createTimeStr,
+                                        order.commonInfo.orderId,
+                                        order.commonInfo.orderCreateTimeStrForB.ParseToDateTime().ToString("M/d HH:mm"),
+                                        prodLite.productId,
+                                        prodLite.skuId,
+                                        prodLite.thumbImg,
+                                        DataGridViewExtension.defaultBitmap,
+                                        prodLite.title + string.Join(";", prodLite.saleParam), // 商品名称
+                                        spuCode, // 商品编号
+                                        prodLite.realPrice * 0.01m + "\r\nx" + prodLite.productCnt, // 商品单价/数量
+                                        order.commonInfo.statusStr,
+                                        order.notesInfo.merchantNotes,
+                                        "取消分配",
+                                        ""
+                                    );
+
+                                    dgvSelectProduct.Rows[rowIndex].Height = 60;
+                                    //Color color = Color.Red;
+                                    //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "在售")
+                                    //    color = Color.Blue;
+                                    //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "下架")
+                                    //    color = Color.Purple;
+                                    //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "草稿箱")
+                                    //    color = Color.DarkOrange;
+                                    //if (dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Value.ParseToString() == "回收站")
+                                    //    color = Color.Gray;
+                                    //dgvSelectProduct.Rows[rowIndex].Cells["colMsg"].Style.ForeColor = color;
+                                }));
+                            }
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+
+                    }
+                }
+            }
+        }
+
+        private void btnClearDgv_Click(object sender, EventArgs e)
+        {
+            var rows = this.dgvSelectProduct.Rows.Cast<DataGridViewRow>().ToList(); //Cast后Rows做foreach循环时仍会夹花跳过，所以要ToList转一个新的数组。
+            foreach (var row in rows)
+            {
+                if (row.Cells["colCheck"].Value.ParseToBool() == true)
+                {
+                    //var draft_id = row.Cells["colDraftId"].Value.ParseToString();
+                    //upload_draft_product_lst.RemoveAll(p => p.draft_id == draft_id);
+
+                    this.dgvSelectProduct.Rows.Remove(row);
+                }
+            }
+            //NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_select_upload_draft_products", upload_draft_product_lst);
+        }
+
+        private void btnClearFilter_Click(object sender, EventArgs e)
+        {
+        }
+
+        private void btnFilterShop_Click(object sender, EventArgs e)
+        {
+            string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
+            if (notes == "全部")
+                notes = "";
+            List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                {
+                    row.Visible = false;
+                    row.Cells["colSelect"].Value = false;
+                    continue;
+                }
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                {
+                    row.Visible = false;
+                    row.Cells["colSelect"].Value = false;
+                    continue;
+                }
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                {
+                    row.Visible = false;
+                    row.Cells["colSelect"].Value = false;
+                    continue;
+                }
+                row.Visible = true;
+            }
+        }
+
+        private void btnEmptyShop_Click(object sender, EventArgs e)
+        {
+            txtFilterShopName.Text = "";
+            cmbFilterShopNotes.Text = "全部";
+            cmbFilterShopGroup.Text = "全部";
+            btnFilterShop_Click(null, null);
+        }
+
+        private void btnReverse_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (row.Visible == true)
+                    row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool();
+            }
+        }
+
+        private void btnAddSelect_Click(object sender, EventArgs e)
+        {
+            string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
+            if (notes == "全部")
+                notes = "";
+            List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = true;
+            }
+        }
+
+        private void btnAddUnSelect_Click(object sender, EventArgs e)
+        {
+            string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
+            if (notes == "全部")
+                notes = "";
+            List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = false;
+            }
+        }
+
+        private void btnSelectOnline_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (row.Visible == true)
+                {
+                    if (row.Cells["colLoginStatus"].Value.ParseToString() == "在线")
+                    {
+                        row.Cells["colSelect"].Value = true;
+                    }
+                    else
+                    {
+                        row.Cells["colSelect"].Value = false;
+                    }
+                }
+            }
+        }
+
+        private void btnSelectOffline_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
+                if (row.Visible == true)
+                {
+                    if (row.Cells["colLoginStatus"].Value.ParseToString() != "在线")
+                    {
+                        row.Cells["colSelect"].Value = true;
+                    }
+                    else
+                    {
+                        row.Cells["colSelect"].Value = false;
+                    }
+                }
+            }
+        }
+
+        private void btnCancelConsignment_Click(object sender, EventArgs e)
+        {
+            var rowLst = dgvSelectProduct.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
+            if (rowLst.Count <= 0)
+            {
+                BaseMsgForm.ShowError("请勾选需要操作的订单！");
+                return;
+            }
+
+            if (BaseMsgForm.ShowConfirm("确认要取消分配吗？取消分配后，订单将回到待分配状态").DialogResult != DialogResult.OK)
+                return;
+
+            this.pbLoading.Visible = true;
+            if (cancellationTokenSource != null && !cancellationTokenSource.IsCancellationRequested)
+                cancellationTokenSource.Cancel();
+            cancellationTokenSource = new CancellationTokenSource();
+            Task.Run(() =>
+            {
+                CancelConsignment(rowLst);
+                Invoke(new Action(() =>
+                {
+                    if (cancellationTokenSource.IsCancellationRequested)
+                    {
+                        this.statusBar.lblTaskStatus.Text = "取消分配中断";
+                        BaseMsgForm.ShowInfo("取消分配中断");
+                    }
+                    else
+                    {
+                        this.statusBar.lblTaskStatus.Text = "取消分配完毕";
+                        BaseMsgForm.ShowInfo("取消分配完毕");
+                    }
+
+                    this.pbLoading.Visible = false;
+                }));
+            }, cancellationTokenSource.Token);
+        }
+
+        void CancelConsignment(List<DataGridViewRow> rowLst)
+        {
+            Invoke(new Action(() =>
+            {
+                this.pbLoading.Visible = true;
+                this.statusBar.lblTaskStatus.Text = "正在取消分配" + "...".Substring(0, DateTime.Now.Second % 4);
+                this.statusBar.pgbTaskProgress.Maximum = rowLst.Count;
+                this.statusBar.UpdateProgressBar(0);
+            }));
+
+            while (rowLst.Count > 0)
+            {
+                if (cancellationTokenSource.IsCancellationRequested)
+                    break;
+
+                var r0 = rowLst.FirstOrDefault();
+                var shopId = r0.Cells["colSupplierId"].Value.ParseToString();
+                var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
+                var rowLstTmp = rowLst.Where(r => r.Cells["colSupplierId"].Value.ParseToString() == shopId).Take(1).ToList();
+
+                foreach (var r in rowLstTmp)
+                {
+                    rowLst.RemoveAll(rw => rw.Cells["colConsignmentOrderId"].Value == r.Cells["colConsignmentOrderId"].Value);
+
+                    Invoke(new Action(() =>
+                    {
+                        this.statusBar.lblTaskStatus.Text = "正在取消分配" + "...".Substring(0, DateTime.Now.Second % 4);
+                        this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1);
+                        r.Cells["colOpResult"].Value = "";
+                    }));
+                }
+                if (shop == null)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        foreach (var r in rowLstTmp)
+                        {
+                            r.Cells["colOpResult"].Value = "店铺不存在";
+                        }
+                    }));
+                    continue;
+                }
+                if (shop.LoginStatus != "登录成功")
+                {
+                    Invoke(new Action(() =>
+                    {
+                        foreach (var r in rowLstTmp)
+                        {
+                            r.Cells["colOpResult"].Value = "店铺掉线";
+                        }
+                    }));
+                    continue;
+                }
+
+                //{"cosignmentOrderId":"4436464658179189760","cosignmentProductList":[{"spuId":"10000826730228","skuId":"14511204738","cancelScene":2}],"orderId":"3736464645960385280"}
+                JObject cancelAssignOrderData = new JObject();
+                foreach (var row in rowLstTmp)
+                {
+                    cancelAssignOrderData["cosignmentOrderId"] = row.Cells["colConsignmentOrderId"].Value.ParseToString();
+                    var jArr = new JArray();
+                    var dgvrs = dgvSelectProduct.Rows.Cast<DataGridViewRow>().Where(dgvr => dgvr.Cells["colConsignmentOrderId"] == row.Cells["colConsignmentOrderId"]).ToList();
+                    foreach (var dgvr in dgvrs)
+                    {
+                        JObject jProd = new JObject();
+                        jProd["spuId"] = dgvr.Cells["colDraftId"].Value.ParseToString();
+                        jProd["skuId"] = dgvr.Cells["colSkuId"].Value.ParseToString();
+                        jProd["cancelScene"] = 2;
+                        jArr.Add(jProd);
+                    }
+                    cancelAssignOrderData["cosignmentProductList"] = jArr;
+                    cancelAssignOrderData["orderId"] = row.Cells["colOrderId"].Value.ParseToString();
+                }
+
+                var cancelRst = WXOrderConsignment.cancelConsignmentOrder(shop, cancelAssignOrderData);
+                Thread.Sleep(Randomx.GetId(500, 1000));
+                if (!cancelRst.Contains("\"code\":0"))
+                {
+                    if (cancelRst.Contains("biz magic invalid"))
+                    {
+                        WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                        if (shop.LoginStatus != "登录成功")
+                        {
+                            Invoke(new Action(() =>
+                            {
+                                foreach (var row in rowLstTmp)
+                                {
+                                    row.Cells["colOpResult"].Value = "店铺掉线";
+                                }
+                            }));
+                            continue;
+                        }
+                    }
+
+                    var errmsg = BaseRegex.GetStringJson(ref cancelRst, "msg");
+                    if (string.IsNullOrWhiteSpace(errmsg))
+                        errmsg = cancelRst;
+
+                    Invoke(new Action(() =>
+                    {
+                        foreach (var row in rowLstTmp)
+                        {
+                            var dgvrs = dgvSelectProduct.Rows.Cast<DataGridViewRow>().Where(dgvr => dgvr.Cells["colConsignmentOrderId"] == row.Cells["colConsignmentOrderId"]).ToList();
+                            foreach (var dgvr in dgvrs)
+                                dgvr.Cells["colOpResult"].Value = errmsg;
+                        }
+                    }));
+                }
+
+                if (cancelRst.Contains("\"code\":0"))
+                {
+                    Invoke(new Action(() =>
+                    {
+                        foreach (var row in rowLstTmp)
+                        {
+                            var dgvrs = dgvSelectProduct.Rows.Cast<DataGridViewRow>().Where(dgvr => dgvr.Cells["colConsignmentOrderId"] == row.Cells["colConsignmentOrderId"]).ToList();
+                            foreach (var dgvr in dgvrs)
+                                dgvr.Cells["colOpResult"].Value = "取消分配成功";
+                        }
+                    }));
+                }
+            }
+        }
+
+        private void btnFiltSelect_Click(object sender, EventArgs e)
+        {
+            foreach (DataGridViewRow row in dgvSelectProduct.Rows)
+            {
+                // 2，3拼多多 6抖音
+                if (!row.Cells["colNotes"].Value.ParseToString().StartsWith("2") && !row.Cells["colNotes"].Value.ParseToString().StartsWith("3") &&
+                    !row.Cells["colNotes"].Value.ParseToString().StartsWith("6"))
+                {
+                    row.Cells["colCheck"].Value = false;
+                    continue;
+                }
+                // ^\d{6}.*$
+                string pattern1 = @"^\d{6}-\d{15}.*$"; // 定义正则表达式模式
+                string pattern2 = @"^\d{19}.*$"; // 定义正则表达式模式
+                Regex regex1 = new Regex(pattern1);
+                Regex regex2 = new Regex(pattern2);
+                if (!regex1.IsMatch(row.Cells["colNotes"].Value.ParseToString()) && !regex2.IsMatch(row.Cells["colNotes"].Value.ParseToString()))
+                {
+                    row.Cells["colCheck"].Value = false;
+                    continue;
+                }
+                row.Cells["colCheck"].Value = true;
+            }
+        }
+
+        void ShowShopError(ShopLoginInfo shop, string operateResult)
+        {
+            var error = BaseRegex.GetStringJson(ref operateResult, "msg");
+            if (string.IsNullOrEmpty(error))
+                error = BaseRegex.GetStringJson(ref operateResult, "errMsg");
+            if (string.IsNullOrEmpty(error))
+                error = BaseRegex.GetStringJson(ref operateResult, "errorMsg");
+            if (string.IsNullOrEmpty(error))
+                error = operateResult;
+
+            WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+            
+            if (shop.LoginStatus != "登录成功")
+            {
+                Invoke(new Action(() => { BindShop(shop, new List<string> { shop.ShopId }, "店铺掉线"); }));
+            }
+            else
+            {
+                Invoke(new Action(() => { BindShop(shop, new List<string> { shop.ShopId }, error); }));
+            }
+        }
+    }
+
+    public class WXOrderConsignment
+    {
+        public static string getConsignmentOnOffStatus(ShopLoginInfo shop)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmecnodesuppliercosignment/associate/cgi/getOpenStatus?token=&lang=zh_CN";
+            string data = "{}";
+            string refere = "https://store.weixin.qq.com/shop/order/consignment";
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, refere);
+            return result;
+        }
+
+        public static string searchConsignmentOrder(ShopLoginInfo shop, int pageNum, int pageSize = 30, bool isWaitDevide = false)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmecnodesuppliercosignment/order/cgi/orderSearch?token=&lang=zh_CN";
+            string data = @"{""pageSize"":" + pageSize + @",""page"":" + pageNum + @",""tab"":1}";
+            if (isWaitDevide)
+                data = @"{""pageSize"":" + pageSize + @",""page"":" + pageNum + @",""orderStatus"":20,""availCosignment"":true}";
+
+            //string body = @"{""pageSize"":30,""page"":1,""startCreateTime"":"""",""endCreateTime"":"""",""orderId"":"""",""title"":"""",""productCode"":"""",""merchantNotes"":"""",""orderStatus"":20,""availCosignment"":true}";
+            //string body = @"{""pageSize"":30,""page"":1,""beginTime"":"""",""endTime"":"""",""createBeginTime"":"""",""createEndTime"":"""",""orderId"":"""",""consignmentOrderId"":"""",""waybillId"":"""",""supplierName"":"""",""productCode"":"""",""spuName"":"""",""note"":"""",""tab"":1}";
+
+            string refere = "https://store.weixin.qq.com/shop/order/consignment";
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, refere);
+            return result;
+        }
+        public static string addConsignmentOrder(ShopLoginInfo shop, JObject dataObj)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmecnodesuppliercosignment/order/cgi/cancelAssignOrder?token=&lang=zh_CN";
+            string data = JsonHelper.SerializeObject(dataObj);
+
+            //{"appid":"wx154836518ed19b88","assignCosignmentList":[{"orderId":"3736464645960385280","cosignmentProductList":[{"spuId":"10000826730228","skuId":"14511204738"}]}]}
+
+            string refere = "https://store.weixin.qq.com/shop/order/consignment";
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, refere);
+            return result;
+        }
+        public static string cancelConsignmentOrder(ShopLoginInfo shop, JObject dataObj)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/mmecnodesuppliercosignment/order/cgi/cancelAssignOrder?token=&lang=zh_CN";
+            string data = JsonHelper.SerializeObject(dataObj);
+
+            //{"cosignmentOrderId":"4436464658179189760","cosignmentProductList":[{"spuId":"10000826730228","skuId":"14511204738","cancelScene":2}],"orderId":"3736464645960385280"}
+
+            string refere = "https://store.weixin.qq.com/shop/order/consignment";
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, data, refere);
+            return result;
+        }
+    }
+
+}

TEMUKJD/WXForms/ProductForms/WXOrderConsignmentForm.resx

@@ -0,0 +1,222 @@
+<?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="colGroup.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="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="colConsignmentOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colConsignmentSupplier.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colConsignmentTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOrderTime.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="colSkuId.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="colProduct.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="colCnt.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="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOperate.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/WXProdClearNoVisitForm.Designer.cs

@@ -749,9 +749,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefreshShop.Location = new System.Drawing.Point(10, 18);
+            this.btnRefreshShop.Location = new System.Drawing.Point(9, 18);
             this.btnRefreshShop.Name = "btnRefreshShop";
-            this.btnRefreshShop.Size = new System.Drawing.Size(165, 18);
+            this.btnRefreshShop.Size = new System.Drawing.Size(166, 18);
             this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));

TEMUKJD/WXForms/ProductForms/WXProdClearNoVisitForm.cs

@@ -121,21 +121,6 @@ namespace TemuKJD.WXForms.ProductForms
 
                 if (!isInit)
                 {
-                    Task.Run(() =>
-                    {
-                        foreach (var shop in GlobalConfig.ShopLoginList)
-                        {
-                            //if (shop.LoginStatus == "登录成功")
-                            //{
-                            //    var rst = WXClearNoVisit.scanProductPreview(shop);
-                            //    if (!rst.Contains("\"code\":0") && !rst.Contains("\"success\":true"))
-                            //    {
-                            //        WXShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false);
-                            //    }
-                            //}
-                        }
-
-                    });
                 }
 
                 isInit = true;

TEMUKJD/WXForms/ProductForms/WXProdSyncForm.Designer.cs

@@ -63,13 +63,15 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnPromotion = new DevComponents.DotNetBar.PanelEx();
             this.btnStopOp = new DevComponents.DotNetBar.PanelEx();
             this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
+            this.label24 = new System.Windows.Forms.Label();
             this.btnSelectOffline = new DevComponents.DotNetBar.PanelEx();
+            this.btnEmptyShop = new DevComponents.DotNetBar.PanelEx();
             this.btnSelectOnline = new DevComponents.DotNetBar.PanelEx();
             this.btnAddUnSelect = new DevComponents.DotNetBar.PanelEx();
             this.btnReverse = new DevComponents.DotNetBar.PanelEx();
             this.cmbFilterShopNotes = new TemuKJD.UserComponent.UcComboBoxMutiSelect();
             this.btnAddSelect = new DevComponents.DotNetBar.PanelEx();
-            this.btnEmptyShop = new DevComponents.DotNetBar.PanelEx();
             this.btnFilterShop = new DevComponents.DotNetBar.PanelEx();
             this.label16 = new System.Windows.Forms.Label();
             this.txtFilterShopName = new System.Windows.Forms.TextBox();
@@ -86,6 +88,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colApi = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -195,7 +198,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx3.Controls.Add(this.btnClearFilter);
             this.ucGroupBoxEx3.Controls.Add(this.label3);
             this.ucGroupBoxEx3.Controls.Add(this.label2);
-            this.ucGroupBoxEx3.Location = new System.Drawing.Point(162, 2);
+            this.ucGroupBoxEx3.Location = new System.Drawing.Point(186, 2);
             this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
             this.ucGroupBoxEx3.Size = new System.Drawing.Size(357, 165);
             this.ucGroupBoxEx3.TabIndex = 668;
@@ -476,9 +479,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.Controls.Add(this.chkFailDownProd);
             this.ucGroupBoxEx4.Controls.Add(this.btnPromotion);
             this.ucGroupBoxEx4.Controls.Add(this.btnStopOp);
-            this.ucGroupBoxEx4.Location = new System.Drawing.Point(518, 2);
+            this.ucGroupBoxEx4.Location = new System.Drawing.Point(542, 2);
             this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
-            this.ucGroupBoxEx4.Size = new System.Drawing.Size(904, 165);
+            this.ucGroupBoxEx4.Size = new System.Drawing.Size(880, 165);
             this.ucGroupBoxEx4.TabIndex = 666;
             this.ucGroupBoxEx4.TabStop = false;
             this.ucGroupBoxEx4.Text = "商品同步";
@@ -548,34 +551,59 @@ namespace TemuKJD.WXForms.ProductForms
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopGroup);
+            this.ucGroupBoxEx1.Controls.Add(this.label24);
             this.ucGroupBoxEx1.Controls.Add(this.btnSelectOffline);
+            this.ucGroupBoxEx1.Controls.Add(this.btnEmptyShop);
             this.ucGroupBoxEx1.Controls.Add(this.btnSelectOnline);
             this.ucGroupBoxEx1.Controls.Add(this.btnAddUnSelect);
             this.ucGroupBoxEx1.Controls.Add(this.btnReverse);
             this.ucGroupBoxEx1.Controls.Add(this.cmbFilterShopNotes);
             this.ucGroupBoxEx1.Controls.Add(this.btnAddSelect);
-            this.ucGroupBoxEx1.Controls.Add(this.btnEmptyShop);
             this.ucGroupBoxEx1.Controls.Add(this.btnFilterShop);
             this.ucGroupBoxEx1.Controls.Add(this.label16);
             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.Size = new System.Drawing.Size(185, 165);
             this.ucGroupBoxEx1.TabIndex = 399;
             this.ucGroupBoxEx1.TabStop = false;
             this.ucGroupBoxEx1.Text = "店铺筛选";
             // 
+            // cmbFilterShopGroup
+            // 
+            this.cmbFilterShopGroup.DefaultText = "全部";
+            this.cmbFilterShopGroup.DropDownHeight = 1;
+            this.cmbFilterShopGroup.DropDownWidth = 1;
+            this.cmbFilterShopGroup.FormattingEnabled = true;
+            this.cmbFilterShopGroup.IntegralHeight = false;
+            this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92);
+            this.cmbFilterShopGroup.Name = "cmbFilterShopGroup";
+            this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25);
+            this.cmbFilterShopGroup.TabIndex = 836;
+            this.cmbFilterShopGroup.Text = "全部";
+            // 
+            // label24
+            // 
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(7, 96);
+            this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(32, 17);
+            this.label24.TabIndex = 837;
+            this.label24.Text = "分组";
+            // 
             // btnSelectOffline
             // 
             this.btnSelectOffline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectOffline.Location = new System.Drawing.Point(61, 137);
+            this.btnSelectOffline.Location = new System.Drawing.Point(59, 139);
             this.btnSelectOffline.Name = "btnSelectOffline";
-            this.btnSelectOffline.Size = new System.Drawing.Size(50, 20);
+            this.btnSelectOffline.Size = new System.Drawing.Size(48, 18);
             this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSelectOffline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSelectOffline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -591,15 +619,40 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSelectOffline.Text = "选掉线";
             this.btnSelectOffline.Click += new System.EventHandler(this.btnSelectOffline_Click);
             // 
+            // btnEmptyShop
+            // 
+            this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnEmptyShop.Location = new System.Drawing.Point(143, 139);
+            this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
+            this.btnEmptyShop.Name = "btnEmptyShop";
+            this.btnEmptyShop.Size = new System.Drawing.Size(32, 18);
+            this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnEmptyShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnEmptyShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmptyShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnEmptyShop.Style.GradientAngle = 90;
+            this.btnEmptyShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmptyShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmptyShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmptyShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmptyShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnEmptyShop.TabIndex = 713;
+            this.btnEmptyShop.Text = "清空";
+            this.btnEmptyShop.Click += new System.EventHandler(this.btnEmptyShop_Click);
+            // 
             // btnSelectOnline
             // 
             this.btnSelectOnline.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectOnline.Location = new System.Drawing.Point(9, 137);
+            this.btnSelectOnline.Location = new System.Drawing.Point(9, 139);
             this.btnSelectOnline.Name = "btnSelectOnline";
-            this.btnSelectOnline.Size = new System.Drawing.Size(50, 20);
+            this.btnSelectOnline.Size = new System.Drawing.Size(48, 18);
             this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSelectOnline.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSelectOnline.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -621,9 +674,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddUnSelect.Location = new System.Drawing.Point(81, 115);
+            this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119);
             this.btnAddUnSelect.Name = "btnAddUnSelect";
-            this.btnAddUnSelect.Size = new System.Drawing.Size(70, 20);
+            this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18);
             this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnAddUnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnAddUnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -645,9 +698,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnReverse.Location = new System.Drawing.Point(113, 137);
+            this.btnReverse.Location = new System.Drawing.Point(109, 139);
             this.btnReverse.Name = "btnReverse";
-            this.btnReverse.Size = new System.Drawing.Size(38, 20);
+            this.btnReverse.Size = new System.Drawing.Size(32, 18);
             this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnReverse.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnReverse.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -670,9 +723,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbFilterShopNotes.DropDownWidth = 1;
             this.cmbFilterShopNotes.FormattingEnabled = true;
             this.cmbFilterShopNotes.IntegralHeight = false;
-            this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 66);
+            this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65);
             this.cmbFilterShopNotes.Name = "cmbFilterShopNotes";
-            this.cmbFilterShopNotes.Size = new System.Drawing.Size(113, 25);
+            this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25);
             this.cmbFilterShopNotes.TabIndex = 442;
             this.cmbFilterShopNotes.Text = "全部";
             // 
@@ -682,9 +735,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddSelect.Location = new System.Drawing.Point(9, 115);
+            this.btnAddSelect.Location = new System.Drawing.Point(9, 119);
             this.btnAddSelect.Name = "btnAddSelect";
-            this.btnAddSelect.Size = new System.Drawing.Size(70, 20);
+            this.btnAddSelect.Size = new System.Drawing.Size(65, 18);
             this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnAddSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnAddSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -697,43 +750,18 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnAddSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnAddSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnAddSelect.TabIndex = 742;
-            this.btnAddSelect.Text = "选中条件";
+            this.btnAddSelect.Text = "加选条件";
             this.btnAddSelect.Click += new System.EventHandler(this.btnAddSelect_Click);
             // 
-            // btnEmptyShop
-            // 
-            this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control;
-            this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmptyShop.Location = new System.Drawing.Point(113, 93);
-            this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
-            this.btnEmptyShop.Name = "btnEmptyShop";
-            this.btnEmptyShop.Size = new System.Drawing.Size(38, 20);
-            this.btnEmptyShop.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnEmptyShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnEmptyShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnEmptyShop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.btnEmptyShop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnEmptyShop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.btnEmptyShop.Style.GradientAngle = 90;
-            this.btnEmptyShop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnEmptyShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnEmptyShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnEmptyShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnEmptyShop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.btnEmptyShop.TabIndex = 713;
-            this.btnEmptyShop.Text = "清空";
-            this.btnEmptyShop.Click += new System.EventHandler(this.btnEmptyShop_Click);
-            // 
             // btnFilterShop
             // 
             this.btnFilterShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnFilterShop.Location = new System.Drawing.Point(9, 93);
+            this.btnFilterShop.Location = new System.Drawing.Point(143, 119);
             this.btnFilterShop.Name = "btnFilterShop";
-            this.btnFilterShop.Size = new System.Drawing.Size(102, 20);
+            this.btnFilterShop.Size = new System.Drawing.Size(32, 18);
             this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnFilterShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnFilterShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -746,13 +774,13 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnFilterShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnFilterShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnFilterShop.TabIndex = 703;
-            this.btnFilterShop.Text = "过滤店铺";
+            this.btnFilterShop.Text = "过滤";
             this.btnFilterShop.Click += new System.EventHandler(this.btnFilterShop_Click);
             // 
             // label16
             // 
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(7, 70);
+            this.label16.Location = new System.Drawing.Point(7, 69);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(32, 17);
@@ -762,10 +790,10 @@ namespace TemuKJD.WXForms.ProductForms
             // txtFilterShopName
             // 
             this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.txtFilterShopName.Location = new System.Drawing.Point(38, 39);
+            this.txtFilterShopName.Location = new System.Drawing.Point(38, 38);
             this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtFilterShopName.Name = "txtFilterShopName";
-            this.txtFilterShopName.Size = new System.Drawing.Size(113, 25);
+            this.txtFilterShopName.Size = new System.Drawing.Size(137, 25);
             this.txtFilterShopName.TabIndex = 653;
             // 
             // btnRefreshShop
@@ -774,9 +802,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefreshShop.Location = new System.Drawing.Point(9, 17);
+            this.btnRefreshShop.Location = new System.Drawing.Point(9, 18);
             this.btnRefreshShop.Name = "btnRefreshShop";
-            this.btnRefreshShop.Size = new System.Drawing.Size(142, 20);
+            this.btnRefreshShop.Size = new System.Drawing.Size(166, 18);
             this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -795,7 +823,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(7, 43);
+            this.label17.Location = new System.Drawing.Point(7, 42);
             this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(32, 17);
@@ -906,6 +934,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopId,
             this.colShopName,
             this.colShopNotes,
+            this.colGroup,
             this.colSelectProduct,
             this.colLoginStatus,
             this.colApi,
@@ -963,7 +992,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.colShopNotes.HeaderText = "备注";
             this.colShopNotes.Name = "colShopNotes";
             this.colShopNotes.ReadOnly = true;
-            this.colShopNotes.Width = 75;
+            this.colShopNotes.Width = 66;
+            // 
+            // colGroup
+            // 
+            this.colGroup.HeaderText = "分组";
+            this.colGroup.Name = "colGroup";
+            this.colGroup.ReadOnly = true;
+            this.colGroup.Width = 66;
             // 
             // colSelectProduct
             // 
@@ -1469,19 +1505,6 @@ namespace TemuKJD.WXForms.ProductForms
         private DevComponents.DotNetBar.PanelEx btnAddSelect;
         private DevComponents.DotNetBar.PanelEx btnSelectOffline;
         private DevComponents.DotNetBar.PanelEx btnSelectOnline;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
-        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
-        private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
-        private System.Windows.Forms.DataGridViewLinkColumn colApi;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
         private System.Windows.Forms.TextBox txtPageBegin;
         private System.Windows.Forms.TextBox txtPageEnd;
         private System.Windows.Forms.Label label1;
@@ -1527,5 +1550,21 @@ namespace TemuKJD.WXForms.ProductForms
         private DevComponents.DotNetBar.PanelEx btnPromotion;
         private DevComponents.DotNetBar.PanelEx btnStopOp;
         private UserComponent.UcCheckBox chkFailDownProd;
+        private UserComponent.UcComboBoxMutiSelect cmbFilterShopGroup;
+        private System.Windows.Forms.Label label24;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
+        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
+        private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
+        private System.Windows.Forms.DataGridViewLinkColumn colApi;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
     }
 }

TEMUKJD/WXForms/ProductForms/WXProdSyncForm.cs

@@ -42,12 +42,7 @@ namespace TemuKJD.WXForms.ProductForms
 
         bool isInit = false;  
         CheckBox chkSelectAll = null;
-        ConcurrentList<WXShopTokenInfo> lstWXShopTokenInfo = new ConcurrentList<WXShopTokenInfo>();
-        public NaiBa.Util.ConcurrentList<TemuDBProductSelect> lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList<TemuDBProductSelect>();
-        NaiBa.Util.ConcurrentList<AddPriceRule> lstAddPriceRule = new NaiBa.Util.ConcurrentList<AddPriceRule>();
-        //public Dictionary<string, List<string>> dicCheckedShopIdList = new Dictionary<string, List<string>>();
         public Dictionary<string, bool> dicCheckedShopId = new Dictionary<string, bool>();
-        public Dictionary<string, WxShopUploadInfo> dicShopUpload = new Dictionary<string, WxShopUploadInfo>();
         public string pdd_product_cates = "";
         public WXProdSyncForm()
         {
@@ -58,23 +53,6 @@ namespace TemuKJD.WXForms.ProductForms
         {
             this.splitContainer1.Dock = DockStyle.Fill;
 
-            lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list");
-            if (lstWXShopTokenInfo == null)
-                lstWXShopTokenInfo = new ConcurrentList<WXShopTokenInfo>();
-
-            lstTemuDBProductSelect = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<TemuDBProductSelect>>("wx_db_prod_upload_list");
-            if (lstTemuDBProductSelect == null)
-                lstTemuDBProductSelect = new NaiBa.Util.ConcurrentList<TemuDBProductSelect>();
-
-            lstAddPriceRule = NaiBa.Util.Helper.ConfigHelper.LoadConfig<NaiBa.Util.ConcurrentList<AddPriceRule>>("wx_add_price_rules");
-            if (lstAddPriceRule == null)
-            { 
-                lstAddPriceRule = new NaiBa.Util.ConcurrentList<AddPriceRule>();
-                lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 0, LessThanPrice = 10, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 });
-                lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 10, LessThanPrice = 20, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 });
-                lstAddPriceRule.Add(new AddPriceRule() { MoreThanPrice = 20, LessThanPrice = 999, AddPriceTimes = 2, AddMorePrice = 10, SinglePriceAdd = 1 });
-            }
-
             dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig<Dictionary<string, bool>>("wx_checked_shop_dic");
             if (dicCheckedShopId == null)
                 dicCheckedShopId = new Dictionary<string, bool>();
@@ -187,11 +165,15 @@ namespace TemuKJD.WXForms.ProductForms
                     BindShop(shopEntity, selectIds);
             }
             cmbFilterShopNotes.Items.Clear();
-            //cmbFilterShopNotes.Items.Add("");
             foreach (var note in GlobalConfig.ShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
             {
                 cmbFilterShopNotes.Items.Add(note);
             }
+            cmbFilterShopGroup.Items.Clear();
+            foreach (var group in GlobalConfig.ShopLoginList.Select(s => s.GroupName).Where(s => !s.IsNullOrEmpty()).Distinct())
+            {
+                cmbFilterShopGroup.Items.Add(group);
+            }
         }
 
         private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null, string msg = "")
@@ -216,14 +198,13 @@ namespace TemuKJD.WXForms.ProductForms
                     shopEntity.ShopId,
                     shopEntity.ShopAccount,
                     shopEntity.Notes,
+                    shopEntity.GroupName,
                     "选择商品",
                     canUse ? "在线" : "掉线",
                     GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期",
                     canUse,
-                    dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ? 
-                        dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0,
-                    dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ?
-                        dicShopUpload[shopEntity.ShopId].OnSaleCount : 0,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0,
+                    GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0,
                     shopEntity.AddProductRemaining,
                     "",
                     msg
@@ -235,15 +216,14 @@ namespace TemuKJD.WXForms.ProductForms
                 row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                 row.Cells["colShopName"].Value = shopEntity.ShopAccount;
                 row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colGroup"].Value = shopEntity.GroupName;
                 row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
                 row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                 row.Cells["colCanUse"].Value = canUse;
                 row.Cells["colApi"].Value = GlobalConfig.lstWxShopAuthInfo.FirstOrDefault(sa => sa.ShopId == shopEntity.ShopId)?.ExpiresTime > DateTime.Now.AddMinutes(5) ? "可用" : "过期";
                 row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
-                row.Cells["colUploadCount"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].DicDayUploadCount.ContainsKey(day) ?
-                    dicShopUpload[shopEntity.ShopId].DicDayUploadCount[day] : 0;
-                row.Cells["colOnSaleNum"].Value = dicShopUpload.ContainsKey(shopEntity.ShopId) && dicShopUpload[shopEntity.ShopId].OnSaleRefreshDay == DateTime.Now.ToString("yyyyMMdd").ParseToInt() ?
-                    dicShopUpload[shopEntity.ShopId].OnSaleCount : 0;
+                row.Cells["colUploadCount"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].DicDayUploadCount[day] : 0;
+                row.Cells["colOnSaleNum"].Value = GlobalConfig.dicWxShopUploadInfo.ContainsKey(shopEntity.ShopId) ? GlobalConfig.dicWxShopUploadInfo[shopEntity.ShopId].OnSaleCount : 0;
                 row.Cells["colMessage"].Value = msg;
             }
 
@@ -350,7 +330,6 @@ namespace TemuKJD.WXForms.ProductForms
                 return;
             string headerText = dgvSelectProduct.Columns[e.ColumnIndex].HeaderText;
             var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString();
-            var dbProduct = lstTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId);
             var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
             var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
             var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId);
@@ -598,13 +577,18 @@ namespace TemuKJD.WXForms.ProductForms
 
         private void btnFilterShop_Click(object sender, EventArgs e)
         {
-            foreach(DataGridViewRow row in dgvShop.Rows)
-            {
-                string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
-                if (notes == "全部")
-                    notes = "";
-                List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+            string notes = cmbFilterShopNotes.Text.Trim().Trim(';');
+            if (notes == "全部")
+                notes = "";
+            List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            foreach (DataGridViewRow row in dgvShop.Rows)
+            {
                 if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
                 {
                     row.Visible = false;
@@ -617,6 +601,12 @@ namespace TemuKJD.WXForms.ProductForms
                     row.Cells["colSelect"].Value = false;
                     continue;
                 }
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                {
+                    row.Visible = false;
+                    row.Cells["colSelect"].Value = false;
+                    continue;
+                }
                 row.Visible = true;
             }
         }
@@ -625,6 +615,7 @@ namespace TemuKJD.WXForms.ProductForms
         {
             txtFilterShopName.Text = "";
             cmbFilterShopNotes.Text = "全部";
+            cmbFilterShopGroup.Text = "全部";
             btnFilterShop_Click(null, null);
         }
 
@@ -644,16 +635,24 @@ namespace TemuKJD.WXForms.ProductForms
                 notes = "";
             List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
             foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                if (row.Visible == true)
-                {
-                    if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
-                        (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())))
-                    {
-                        row.Cells["colSelect"].Value = true;
-                    }
-                }
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = true;
             }
         }
 
@@ -664,16 +663,24 @@ namespace TemuKJD.WXForms.ProductForms
                 notes = "";
             List<string> notesLst = notes.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
 
+            string group = cmbFilterShopGroup.Text.Trim().Trim(';');
+            if (group == "全部")
+                group = "";
+            List<string> groupLst = group.Split(new string[] { ";", "；", ",", "，" }, StringSplitOptions.RemoveEmptyEntries).ToList();
+
             foreach (DataGridViewRow row in dgvShop.Rows)
             {
-                if (row.Visible == true)
-                {
-                    if (row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()) &&
-                        (string.IsNullOrWhiteSpace(notes) || notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString())))
-                    {
-                        row.Cells["colSelect"].Value = false;
-                    }
-                }
+                if (row.Visible == false)
+                    continue;
+
+                if (!row.Cells["colShopName"].Value.ParseToString().Contains(txtFilterShopName.Text.Trim()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(notes) && !notesLst.Contains(row.Cells["colShopNotes"].Value.ParseToString()))
+                    continue;
+                if (!string.IsNullOrWhiteSpace(group) && !groupLst.Contains(row.Cells["colGroup"].Value.ParseToString()))
+                    continue;
+
+                row.Cells["colSelect"].Value = false;
             }
         }
 

TEMUKJD/WXForms/ProductForms/WXProdSyncForm.resx

@@ -129,6 +129,9 @@
   <metadata name="colShopNotes.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="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs

@@ -32,17 +32,21 @@
             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("机会商品采集");
-            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("商品管理", 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("订单代发管理");
+            System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("机会商品采集");
+            System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
             treeNode4,
             treeNode5,
             treeNode6,
-            treeNode7});
+            treeNode7,
+            treeNode8,
+            treeNode9});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -141,16 +145,20 @@
             treeNode3.Text = "清理无流量";
             treeNode4.Name = "爆单神器";
             treeNode4.Text = "爆单神器";
-            treeNode5.Name = "达人广场";
-            treeNode5.Text = "达人广场";
-            treeNode6.Name = "商品同步";
-            treeNode6.Text = "商品同步";
-            treeNode7.Name = "机会商品采集";
-            treeNode7.Text = "机会商品采集";
-            treeNode8.Name = "商品管理";
-            treeNode8.Text = "商品管理";
+            treeNode5.Name = "活动报名";
+            treeNode5.Text = "活动报名";
+            treeNode6.Name = "达人广场";
+            treeNode6.Text = "达人广场";
+            treeNode7.Name = "商品同步";
+            treeNode7.Text = "商品同步";
+            treeNode8.Name = "订单代发管理";
+            treeNode8.Text = "订单代发管理";
+            treeNode9.Name = "机会商品采集";
+            treeNode9.Text = "机会商品采集";
+            treeNode10.Name = "商品管理";
+            treeNode10.Text = "商品管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode8});
+            treeNode10});
             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

@@ -23,7 +23,9 @@ namespace TemuKJD.WXForms.ProductForms
         public Lazy<WXProdCouponOrderBoomForm> wxProdCouponForm = new Lazy<WXProdCouponOrderBoomForm>();
         public Lazy<WXProdSyncForm> wxProdSyncForm = new Lazy<WXProdSyncForm>();
         public Lazy<WXFinderSquareForm> wxFinderSquareForm = new Lazy<WXFinderSquareForm>();
+        public Lazy<WXActivity618Form> wxActivityForm = new Lazy<WXActivity618Form>();
         public Lazy<PDDGetChanceProdForm> getChanceProdForm = new Lazy<PDDGetChanceProdForm>();
+        public Lazy<WXOrderConsignmentForm> orderConsignmentForm = new Lazy<WXOrderConsignmentForm>();
 
         public WXProductForm()
         {
@@ -89,9 +91,15 @@ namespace TemuKJD.WXForms.ProductForms
                         case "达人广场":
                             SetForm(wxFinderSquareForm.Value);
                             break;
+                        case "活动报名":
+                            SetForm(wxActivityForm.Value);
+                            break;
                         case "商品同步":
                             SetForm(wxProdSyncForm.Value);
                             break;
+                        case "订单代发管理":
+                            SetForm(orderConsignmentForm.Value);
+                            break;
                         case "机会商品采集":
                             getChanceProdForm.Value.IsAuthorityUser = true;
                             SetForm(getChanceProdForm.Value);

TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs

@@ -56,6 +56,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSetShop = new DevComponents.DotNetBar.PanelEx();
             this.btnSelect = new DevComponents.DotNetBar.PanelEx();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.txtViewUvMin = new System.Windows.Forms.TextBox();
+            this.chkViewUvMin = 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();
@@ -150,6 +152,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colGetType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSpProdType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colWxSafe = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colViewUv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colMdyTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -291,6 +294,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.txtViewUvMin, 11, 1);
+            this.tableLayoutPanel1.Controls.Add(this.chkViewUvMin, 10, 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);
@@ -322,6 +327,27 @@ namespace TemuKJD.WXForms.ProductForms
             this.tableLayoutPanel1.Size = new System.Drawing.Size(1193, 105);
             this.tableLayoutPanel1.TabIndex = 679;
             // 
+            // txtViewUvMin
+            // 
+            this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtViewUvMin.Location = new System.Drawing.Point(1127, 41);
+            this.txtViewUvMin.Name = "txtViewUvMin";
+            this.txtViewUvMin.Size = new System.Drawing.Size(63, 23);
+            this.txtViewUvMin.TabIndex = 882;
+            this.txtViewUvMin.Visible = false;
+            // 
+            // chkViewUvMin
+            // 
+            this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.chkViewUvMin.Location = new System.Drawing.Point(1073, 42);
+            this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.chkViewUvMin.Name = "chkViewUvMin";
+            this.chkViewUvMin.Size = new System.Drawing.Size(48, 21);
+            this.chkViewUvMin.TabIndex = 883;
+            this.chkViewUvMin.Text = "曝光≥";
+            this.chkViewUvMin.UseVisualStyleBackColor = true;
+            this.chkViewUvMin.Visible = false;
+            // 
             // cmbHot
             // 
             this.cmbHot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -330,10 +356,10 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "爆款数据",
             "普通商品"});
-            this.cmbHot.Location = new System.Drawing.Point(934, 5);
+            this.cmbHot.Location = new System.Drawing.Point(917, 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.Size = new System.Drawing.Size(147, 25);
             this.cmbHot.TabIndex = 882;
             this.cmbHot.Text = "普通商品";
             this.cmbHot.Visible = false;
@@ -343,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblHot.AutoSize = true;
-            this.lblHot.Location = new System.Drawing.Point(890, 9);
+            this.lblHot.Location = new System.Drawing.Point(873, 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);
@@ -353,14 +379,14 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // btnSearch
             // 
-            this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             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(1091, 5);
+            this.btnSearch.Location = new System.Drawing.Point(1070, 5);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(46, 25);
+            this.btnSearch.Size = new System.Drawing.Size(51, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -378,13 +404,13 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // btnEmpty
             // 
-            this.btnEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             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(1143, 5);
+            this.btnEmpty.Location = new System.Drawing.Point(1127, 5);
             this.btnEmpty.Name = "btnEmpty";
-            this.btnEmpty.Size = new System.Drawing.Size(46, 25);
+            this.btnEmpty.Size = new System.Drawing.Size(63, 25);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
             this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -409,10 +435,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat3.DropDownWidth = 1;
             this.cmbCat3.FormattingEnabled = true;
             this.cmbCat3.IntegralHeight = false;
-            this.cmbCat3.Location = new System.Drawing.Point(733, 7);
+            this.cmbCat3.Location = new System.Drawing.Point(720, 7);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(151, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(147, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.Text = "全部";
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged);
@@ -422,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(682, 9);
+            this.label17.Location = new System.Drawing.Point(669, 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);
@@ -437,10 +463,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat2.DropDownWidth = 1;
             this.cmbCat2.FormattingEnabled = true;
             this.cmbCat2.IntegralHeight = false;
-            this.cmbCat2.Location = new System.Drawing.Point(525, 7);
+            this.cmbCat2.Location = new System.Drawing.Point(517, 7);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(151, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(146, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.Text = "全部";
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged);
@@ -450,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(474, 9);
+            this.label14.Location = new System.Drawing.Point(466, 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);
@@ -465,10 +491,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat1.DropDownWidth = 1;
             this.cmbCat1.FormattingEnabled = true;
             this.cmbCat1.IntegralHeight = false;
-            this.cmbCat1.Location = new System.Drawing.Point(298, 5);
+            this.cmbCat1.Location = new System.Drawing.Point(294, 5);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(151, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(147, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.Text = "全部";
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged);
@@ -478,7 +504,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(247, 9);
+            this.label2.Location = new System.Drawing.Point(243, 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);
@@ -491,7 +517,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(151, 23);
+            this.txtProdName.Size = new System.Drawing.Size(147, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // label3
@@ -528,14 +554,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbWxSafe.Location = new System.Drawing.Point(71, 40);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(151, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(147, 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.Location = new System.Drawing.Point(227, 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);
@@ -547,10 +573,10 @@ namespace TemuKJD.WXForms.ProductForms
             // 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.Location = new System.Drawing.Point(294, 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.Size = new System.Drawing.Size(147, 23);
             this.txtCatBoundMoreThan.TabIndex = 882;
             this.txtCatBoundMoreThan.Text = "1000";
             this.txtCatBoundMoreThan.Visible = false;
@@ -558,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms
             // chkCatBoundLessThan
             // 
             this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundLessThan.Location = new System.Drawing.Point(458, 42);
+            this.chkCatBoundLessThan.Location = new System.Drawing.Point(450, 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);
@@ -570,10 +596,10 @@ namespace TemuKJD.WXForms.ProductForms
             // 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.Location = new System.Drawing.Point(517, 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.Size = new System.Drawing.Size(146, 23);
             this.txtCatBoundLessThan.TabIndex = 883;
             this.txtCatBoundLessThan.Text = "100000";
             this.txtCatBoundLessThan.Visible = false;
@@ -582,10 +608,10 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             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, 42);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(917, 42);
             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.Size = new System.Drawing.Size(147, 25);
             this.cmbGroupFilter.TabIndex = 653;
             this.cmbGroupFilter.Visible = false;
             // 
@@ -593,7 +619,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(689, 44);
+            this.lblSourceType.Location = new System.Drawing.Point(676, 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);
@@ -605,7 +631,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(890, 44);
+            this.lblGroup.Location = new System.Drawing.Point(873, 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);
@@ -627,10 +653,10 @@ namespace TemuKJD.WXForms.ProductForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(733, 42);
+            this.cmbSourceType.Location = new System.Drawing.Point(720, 42);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(151, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(147, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.Text = "厂商直采";
             this.cmbSourceType.Visible = false;
@@ -1260,6 +1286,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.colGetType,
             this.colSpProdType,
             this.colWxSafe,
+            this.colViewUv,
             this.colAddTime,
             this.colMdyTime,
             this.col_edit,
@@ -1532,6 +1559,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.colWxSafe.Name = "colWxSafe";
             this.colWxSafe.ReadOnly = true;
             // 
+            // colViewUv
+            // 
+            this.colViewUv.FillWeight = 50F;
+            this.colViewUv.HeaderText = "曝光量";
+            this.colViewUv.Name = "colViewUv";
+            this.colViewUv.ReadOnly = true;
+            this.colViewUv.Visible = false;
+            // 
             // colAddTime
             // 
             dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
@@ -1707,6 +1742,16 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colShopGroup;
         private DevComponents.DotNetBar.PanelEx btnSetShop;
         private System.Windows.Forms.Label lblSetShop;
+        private System.Windows.Forms.TextBox txtCatBoundLessThan;
+        private System.Windows.Forms.TextBox txtCatBoundMoreThan;
+        private UserComponent.UcCheckBox chkCatBoundLessThan;
+        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;
+        private UserComponent.UcCheckBox chkViewUvMin;
+        private System.Windows.Forms.TextBox txtViewUvMin;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
         private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId;
@@ -1737,18 +1782,11 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colGetType;
         private System.Windows.Forms.DataGridViewTextBoxColumn colSpProdType;
         private System.Windows.Forms.DataGridViewTextBoxColumn colWxSafe;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colViewUv;
         private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn colMdyTime;
         private System.Windows.Forms.DataGridViewLinkColumn col_edit;
         private System.Windows.Forms.DataGridViewLinkColumn col_delete;
         private System.Windows.Forms.DataGridViewLinkColumn col_select_product;
-        private System.Windows.Forms.TextBox txtCatBoundLessThan;
-        private System.Windows.Forms.TextBox txtCatBoundMoreThan;
-        private UserComponent.UcCheckBox chkCatBoundLessThan;
-        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

@@ -127,6 +127,8 @@ namespace TemuKJD.WXForms.ProductForms
             {
                 lblHot.Visible = true;
                 cmbHot.Visible = true;
+                chkViewUvMin.Visible = true;
+                txtViewUvMin.Visible = true;
             }
 
             var ctrls = tableLayoutPanel1.Controls.Cast<Control>().ToList();
@@ -136,7 +138,7 @@ namespace TemuKJD.WXForms.ProductForms
                 for (int i = 0; i < 10; i++)
                 {
                     var ctrl = ctrls.FirstOrDefault(c => tableLayoutPanel1.GetRow(c) == j && tableLayoutPanel1.GetColumn(c) == i);
-                    // tableLayoutPanel1.GetControlFromPosition(i, j); 取不到隐藏的商品
+                    // tableLayoutPanel1.GetControlFromPosition(i, j); 取不到隐藏的控件
                     if (ctrl != null)
                         ctrlLst.Add(ctrl);
                     else
@@ -144,6 +146,8 @@ namespace TemuKJD.WXForms.ProductForms
                     }
                 }
             }
+            ctrlLst.Add(chkViewUvMin);
+            ctrlLst.Add(txtViewUvMin);
 
             for (int i = 0; i < ctrlLst.Count - 1; i++)
             {
@@ -156,12 +160,12 @@ namespace TemuKJD.WXForms.ProductForms
                     tableLayoutPanel1.SetRow(ctrlLst[i + 1], row);
                     tableLayoutPanel1.SetColumn(ctrlLst[i + 1], column);
                 }
-                else if (column < 9)
+                else if ((row == 0 && column < 9) || (row > 0 && column < 11))
                 {
                     tableLayoutPanel1.SetRow(ctrlLst[i + 1], row);
                     tableLayoutPanel1.SetColumn(ctrlLst[i + 1], column + 1);
                 }
-                else if (column >= 9)
+                else if ((row == 0 && column >= 9) || (row > 0 && column >= 11))
                 {
                     tableLayoutPanel1.SetRow(ctrlLst[i + 1], row + 1);
                     tableLayoutPanel1.SetColumn(ctrlLst[i + 1], 0);
@@ -170,7 +174,7 @@ namespace TemuKJD.WXForms.ProductForms
 
             for (int i = 0; i < 10; i++)
             {
-                if (tableLayoutPanel1.GetControlFromPosition(i, 0) == null && tableLayoutPanel1.GetControlFromPosition(i, 1) == null)// 取不到隐藏的商品
+                if (tableLayoutPanel1.GetControlFromPosition(i, 0) == null && tableLayoutPanel1.GetControlFromPosition(i, 1) == null) // 取不到隐藏的控件
                 {
                     tableLayoutPanel1.ColumnStyles[i].SizeType = SizeType.AutoSize;
                 }
@@ -296,6 +300,7 @@ namespace TemuKJD.WXForms.ProductForms
                             prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : prod.product_get_type_text,
                             prod.special_prod_type,
                             prod.wx_safe_status,
+                            prod.view_uv,
                             prod.add_time.ToString("yy-MM-dd HH:mm"),
                             prod.mdy_time.ToString("yy-MM-dd HH:mm"),
                             "编辑",
@@ -306,6 +311,15 @@ namespace TemuKJD.WXForms.ProductForms
                     }));
                 }
 
+                if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("爆款数据") && lstTemuDbProduct.Any( p=> !p.view_uv.IsNullOrZero()))
+                {
+                    Invoke(new Action(() => { dgvDbProduct.Columns["colViewUv"].Visible = true; }));
+                }
+                else
+                {
+                    Invoke(new Action(() => { dgvDbProduct.Columns["colViewUv"].Visible = false; }));
+                }
+
                 Invoke(new Action(() =>
                 {
                     ShowDgvImg();
@@ -390,6 +404,11 @@ namespace TemuKJD.WXForms.ProductForms
                     "&search_prod_name=" + txtProdName.Text.Trim() +
                     "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验").Replace("违规商品", "");
 
+                if (chkViewUvMin.Checked)
+                {
+                    data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt();
+                }
+
                 // 同时刷新下商品分组
                 string addUserName = BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin";
                 if (BaseClass.GroupId != 3)

TEMUKJD/WXForms/ProductForms/WXUserProdListForm.resx

@@ -228,6 +228,9 @@
   <metadata name="colWxSafe.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="colAddTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs

@@ -48,6 +48,7 @@ namespace TemuKJD.WXForms.ShopForms
         ConcurrentList<WxOptimizeProductEvaluationInfo> lstWxOptimizeProductEvaluationInfo = new ConcurrentList<WxOptimizeProductEvaluationInfo>();
         ConcurrentList<WxOptimizeOrderWayBillInfo> lstWxOptimizeOrderWayBillInfo = new ConcurrentList<WxOptimizeOrderWayBillInfo>(); // 揽收
         ConcurrentList<WxOptimizeLinerCgiInfo> lstWxOptrimizeLinerCgiInfo = new ConcurrentList<WxOptimizeLinerCgiInfo>(); // 物流
+        ConcurrentList<WxOptimizeFeedbackOrderInfo> lstWxOptimizeFeedbackOrderInfo = new ConcurrentList<WxOptimizeFeedbackOrderInfo>(); // 反向物流
 
         public WXShopOptimizeForm()
         {
@@ -56,7 +57,7 @@ namespace TemuKJD.WXForms.ShopForms
 
         private void UserSelectDbProductForm_Load(object sender, EventArgs e)
         {
-            this.ucTabControl1.TabPages.RemoveAt(4);
+            //this.ucTabControl1.TabPages.RemoveAt(4);
 
             dicCheckedShopId = NaiBa.Util.Helper.ConfigHelper.LoadConfig<Dictionary<string, bool>>("wx_checked_shop_dic");
             if (dicCheckedShopId == null)
@@ -74,6 +75,8 @@ namespace TemuKJD.WXForms.ShopForms
             dgvData3.AddImgColumn("colDgv3Img", "colDgv3ImgUrl");
             dgvData4.AddSelectorColumn("colDgv4Check");
             dgvData4.AddImgColumn("colDgv4Img", "colDgv4ImgUrl");
+            dgvData5.AddSelectorColumn("colDgv5Check");
+            dgvData5.AddImgColumn("colDgv5Img", "colDgv5ImgUrl");
 
             IsLoadComplate = true;
         }
@@ -482,6 +485,12 @@ namespace TemuKJD.WXForms.ShopForms
                 dgvData4.Rows.Clear();
                 lstWxOptrimizeLinerCgiInfo.Clear();
             }
+            if (ucCheckBox5.Checked)
+            {
+                pictureBox5.Visible = true;
+                dgvData5.Rows.Clear();
+                lstWxOptimizeFeedbackOrderInfo.Clear();
+            }
             Task.Run(() =>
             {
                 List<ShopLoginInfo> shopLst = GlobalConfig.ShopLoginList.Where(s => lstShopId.Contains(s.ShopId)).ToList();
@@ -510,6 +519,11 @@ namespace TemuKJD.WXForms.ShopForms
                         SearchData4(shop);
                         Thread.Sleep(Randomx.GetId(200, 500));
                     }
+                    if (ucCheckBox5.Checked)
+                    {
+                        SearchData5(shop);
+                        Thread.Sleep(Randomx.GetId(200, 500));
+                    }
                 }
                 Invoke(new Action(() =>
                 {
@@ -531,6 +545,7 @@ namespace TemuKJD.WXForms.ShopForms
                     pictureBox2.Visible = false;
                     pictureBox3.Visible = false;
                     pictureBox4.Visible = false;
+                    pictureBox5.Visible = false;
                     btnSearch.Enabled = true;
                 }));
             }, cancellationTokenSource.Token).ContinueWith(delegate
@@ -599,9 +614,9 @@ namespace TemuKJD.WXForms.ShopForms
                         this.statusBar.lblTaskStatus.Text = "正在查询品质退款，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
                     }));
                     var orderAfterSaleInfoLst = new List<WxOptimizeOrderAfterSaleInfo>();
-                    foreach (JObject refundOrderObj in prodObjs["data"])
+                    foreach (JObject badOrderObj in prodObjs["data"])
                     {
-                        var oStr = JsonHelper.SerializeObject(refundOrderObj);
+                        var oStr = JsonHelper.SerializeObject(badOrderObj);
                         var refundOrder = JsonHelper.DeserializeJsonToObject<WxOptimizeOrderAfterSaleInfo>(oStr);
                         if (lstWxOptimizeOrderAfterSaleInfo.Any(o => o.orderInfo.orderId == refundOrder.orderInfo.orderId))
                             continue;
@@ -912,9 +927,9 @@ namespace TemuKJD.WXForms.ShopForms
                         break;
 
                     var productEvaluationInfoLst = new List<WxOptimizeProductEvaluationInfo>();
-                    foreach (JObject refundOrderObj in prodObjs["finderProductEvaluationInfoList"])
+                    foreach (JObject badOrderObj in prodObjs["finderProductEvaluationInfoList"])
                     {
-                        var oStr = JsonHelper.SerializeObject(refundOrderObj);
+                        var oStr = JsonHelper.SerializeObject(badOrderObj);
                         var prodEvaluationInfo = JsonHelper.DeserializeJsonToObject<WxOptimizeProductEvaluationInfo>(oStr);
                         if (lstWxOptimizeProductEvaluationInfo.Any(o => o.productEvaluationId == prodEvaluationInfo.productEvaluationId))
                             continue;
@@ -1252,9 +1267,9 @@ namespace TemuKJD.WXForms.ShopForms
                     }));
 
                     List<WxOptimizeOrderWayBillInfo> waybillLst = new List<WxOptimizeOrderWayBillInfo>();
-                    foreach (JObject refundOrderObj in wayBillObjs["data"])
+                    foreach (JObject badOrderObj in wayBillObjs["data"])
                     {
-                        var oStr = JsonHelper.SerializeObject(refundOrderObj);
+                        var oStr = JsonHelper.SerializeObject(badOrderObj);
                         var orderWayBill = JsonHelper.DeserializeJsonToObject<WxOptimizeOrderWayBillInfo>(oStr);
                         if (lstWxOptimizeOrderWayBillInfo.Any(o => o.orderInfo.orderId == orderWayBill.orderInfo.orderId))
                             continue;
@@ -1611,9 +1626,9 @@ namespace TemuKJD.WXForms.ShopForms
                         this.statusBar.lblTaskStatus.Text = "正在查询配送不达标，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
                     }));
                     List<WxOptimizeLinerCgiInfo> optrimizeLinerCgiLst = new List<WxOptimizeLinerCgiInfo>();
-                    foreach (JObject refundOrderObj in wayBillObjs["list"])
+                    foreach (JObject badOrderObj in wayBillObjs["list"])
                     {
-                        var oStr = JsonHelper.SerializeObject(refundOrderObj);
+                        var oStr = JsonHelper.SerializeObject(badOrderObj);
                         var orderLinerCgiInfo = JsonHelper.DeserializeJsonToObject<WxOptimizeLinerCgiInfo>(oStr);
                         if (lstWxOptrimizeLinerCgiInfo.Any(o => o.order_id == orderLinerCgiInfo.order_id))
                             continue;
@@ -1857,6 +1872,344 @@ namespace TemuKJD.WXForms.ShopForms
             }
         }
 
+
+        public void SearchData5(ShopLoginInfo shop)
+        {
+            if (shop.LoginStatus != "登录成功")
+            {
+                return;
+            }
+
+            // 查询店铺是24小时时效还是48小时时效
+            bool is24 = false;
+            var is24Rst = ShopOptimize.Get24H48HFlag(shop); // if_24hOr_48hFlag
+            if (!is24Rst.Contains("\"code\":0") || BaseRegex.GetStringJson(ref is24Rst, "if_24hOr_48hFlag").IsNullOrEmpty())
+            {
+                var error = BaseRegex.GetStringJson(ref is24Rst, "msg");
+                if (string.IsNullOrEmpty(error))
+                    error = is24Rst;
+
+                WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                if (shop.LoginStatus != "登录成功")
+                {
+                    var shopIdLst = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                        => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
+                    Invoke(new Action(() => { BindShop(shop, shopIdLst, "店铺掉线"); }));
+                }
+                else
+                {
+                    Invoke(new Action(() =>
+                    {
+                        var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
+                        if (shopRow != null)
+                        {
+                            shopRow.Cells["colMessage"].Value = "查询时效失败" + error;
+                            if (error.Contains("\"code\":2") && error.Contains("[194,62,3,176,14,1]"))
+                                shopRow.Cells["colMessage"].Value = "店铺无时效评分";
+                        }
+                    }));
+                }
+                return;
+            }
+            is24 = BaseRegex.GetStringJson(ref is24Rst, "if_24hOr_48hFlag") == "1";
+
+            int page = 0;
+            int totalPage = 1;
+            int pageSize = 20;
+            int startTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now.Date.AddDays(-30));
+            int endTime = BaseClass.DateTimeToTimestampSeconds(DateTime.Now) - 1;
+            while (page < totalPage)
+            {
+                page++;
+
+                if (cancellationTokenSource.IsCancellationRequested)
+                    break;
+
+                var getData5 = ShopOptimize.GetFeedbackOrder(shop, page, startTime, endTime, is24);
+                Thread.Sleep(Randomx.GetId(300, 600));
+                if (!getData5.Contains("\"code\":0"))
+                {
+                    var error = BaseRegex.GetStringJson(ref getData5, "msg");
+                    if (string.IsNullOrEmpty(error))
+                        error = getData5;
+
+                    WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
+                    if (shop.LoginStatus != "登录成功")
+                    {
+                        var shopIdLst = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
+                            => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
+                        Invoke(new Action(() => { BindShop(shop, shopIdLst, "店铺掉线"); }));
+                    }
+                    else
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
+                            if (shopRow != null)
+                                shopRow.Cells["colMessage"].Value = error;
+                        }));
+                    }
+                    break;
+                }
+
+                try
+                {
+                    var feedbackObjs = JsonHelper.JObjectParse(getData5);
+                    if (page == 1)
+                    {
+                        var totalNum = feedbackObjs["total"].ParseToInt();
+                        totalPage = Math.Ceiling(1m * totalNum / pageSize).ParseToInt();
+                    }
+                    Invoke(new Action(() =>
+                    {
+                        this.pictureBox5.Visible = true;
+                        this.statusBar.lblTaskStatus.Text = "正在查询反向物流，店铺：" + shop.ShopAccount + " " + page + "/" + totalPage;
+                    }));
+                    List<WxOptimizeFeedbackOrderInfo> optrimizeFeedbackOrderLst = new List<WxOptimizeFeedbackOrderInfo>();
+                    foreach (JObject badOrderObj in feedbackObjs["data"])
+                    {
+                        var oStr = JsonHelper.SerializeObject(badOrderObj);
+                        var feedbackOrderInfo = JsonHelper.DeserializeJsonToObject<WxOptimizeFeedbackOrderInfo>(oStr);
+                        if (lstWxOptimizeFeedbackOrderInfo.Any(o => o.orderInfo.orderId == feedbackOrderInfo.orderInfo.orderId))
+                            continue;
+                        feedbackOrderInfo.shopId = shop.ShopId;
+                        feedbackOrderInfo.shopName = shop.ShopAccount;
+
+                        optrimizeFeedbackOrderLst.Add(feedbackOrderInfo);
+                    }
+
+                    // 获取收货地址
+                    if (1 == 1)
+                    {
+                        var orderIds = string.Join(",", optrimizeFeedbackOrderLst.Select(f => f.orderInfo.orderId));
+                        var getOrderRst = ShopOptimize.orderSearchByOrderId(shop, orderIds);
+                        Thread.Sleep(Randomx.GetId(200, 350));
+                        if (!getOrderRst.Contains("\"code\":0"))
+                        {
+                            var error = BaseRegex.GetStringJson(ref getOrderRst, "msg");
+                            if (string.IsNullOrEmpty(error))
+                                error = getOrderRst;
+
+                            foreach (var linerCgi in optrimizeFeedbackOrderLst)
+                            {
+                                linerCgi.province = "地址获取失败";
+                            }
+                        }
+                        else
+                        {
+                            try
+                            {
+                                var orderObj = JsonHelper.JObjectParse(getOrderRst)["orderList"];
+                                var wxOrderLst = JsonHelper.DeserializeJsonToList<WxOrderInfoLite>(JsonHelper.SerializeObject(orderObj));
+
+                                foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                                {
+                                    var wxOrder = wxOrderLst.FirstOrDefault(o => o.commonInfo.orderId == feedbackOrder.orderInfo.orderId);
+                                    if (wxOrder != null)
+                                    {
+                                        feedbackOrder.orderTime = wxOrder.commonInfo.createTime;
+                                        feedbackOrder.province = wxOrder.acceptInfo.addressInfo.provinceName;
+                                        feedbackOrder.city = wxOrder.acceptInfo.addressInfo.cityName;
+                                        feedbackOrder.district = wxOrder.acceptInfo.addressInfo.countyName;
+                                    }
+                                }
+                            }
+                            catch
+                            {
+                                foreach (var linerCgi in optrimizeFeedbackOrderLst)
+                                {
+                                    linerCgi.province = "地址解析失败";
+                                }
+                            }
+                        }
+                    }
+
+                    // 查询是否被优化过
+                    var url = BaseClass.BuildObjString("shop/get_waybill_no_user_name");
+                    var data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&status=2";
+                    data += "&order_ids=" + string.Join(",", optrimizeFeedbackOrderLst.Select(f => f.orderInfo.orderId));
+                    var html = GetHtml.PostUtf8(url, data);
+                    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                        html = GetHtml.PostUtf8(url, data);
+                    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                        html = GetHtml.PostUtf8(url, data);
+                    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                    {
+                        foreach (var linerCgi in optrimizeFeedbackOrderLst)
+                        {
+                            linerCgi.optimizeWaybillId = "查询失败";
+                            linerCgi.optimizeTime = "";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeExpressInfo>(sProd);
+                            foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == feedbackOrder.orderInfo.orderId);
+                                feedbackOrder.optimizeWaybillId = ov == null ? "" : ov.waybill_id;
+                                feedbackOrder.optimizeTime = ov == null ? "" : ov?.use_time?.ToString("MM-dd HH:mm");
+                                if (!string.IsNullOrEmpty(feedbackOrder.optimizeWaybillId))
+                                    feedbackOrder.optimizeWaybillId = "已补发" + "\r\n" + ov?.delivery_id + ":" + ov?.waybill_id;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var linerCgi in optrimizeFeedbackOrderLst)
+                            {
+                                linerCgi.optimizeWaybillId = "查询失败";
+                                linerCgi.optimizeTime = "";
+                            }
+                        }
+                    }
+
+                    // 查询是否有失败记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_rst");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", optrimizeFeedbackOrderLst.Select(f => f.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 feedbackOrder in optrimizeFeedbackOrderLst)
+                        {
+                            if (feedbackOrder.optimizeWaybillId.IsNullOrEmpty())
+                            {
+                                feedbackOrder.optimizeWaybillId = "查询失败";
+                                feedbackOrder.optimizeTime = "";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRstInfo>(sProd);
+                            foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                            {
+                                if (feedbackOrder.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    var ov = optimizeLst.FirstOrDefault(o => o.order_id == feedbackOrder.orderInfo.orderId);
+                                    feedbackOrder.optimizeWaybillId = ov == null ? "" : ov.optimize_rst;
+                                    feedbackOrder.optimizeTime = ov == null ? "" : ov?.mdy_time.ToString("MM-dd HH:mm");
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                            {
+                                if (feedbackOrder.optimizeWaybillId.IsNullOrEmpty())
+                                {
+                                    feedbackOrder.optimizeWaybillId = "查询失败";
+                                    feedbackOrder.optimizeTime = "";
+                                }
+                            }
+                        }
+                    }
+
+                    // 查询备注记录
+                    url = BaseClass.BuildObjString("shop/get_express_optimize_remark");
+                    data = "";
+                    data = UserLogin.GetSignaturex();
+                    data += "&order_ids=" + string.Join(",", optrimizeFeedbackOrderLst.Select(f => f.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 linerCgi in optrimizeFeedbackOrderLst)
+                        {
+                            linerCgi.remark = "备注查询失败";
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var jArr = JObject.Parse(html)["data"];
+                            var sProd = JsonHelper.SerializeObject(jArr);
+                            var optimizeLst = JsonHelper.DeserializeJsonToList<WxOptimizeRemarkInfo>(sProd);
+                            foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                            {
+                                var ov = optimizeLst.FirstOrDefault(o => o.order_id == feedbackOrder.orderInfo.orderId);
+                                feedbackOrder.remark = ov == null ? "" : ov.remark;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            foreach (var linerCgi in optrimizeFeedbackOrderLst)
+                            {
+                                linerCgi.remark = "备注查询失败 " + ex.Message;
+                            }
+                        }
+                    }
+
+                    foreach (var feedbackOrder in optrimizeFeedbackOrderLst)
+                    {
+                        if (CheckOrderExist(feedbackOrder.orderInfo.orderId))
+                            continue;
+
+                        lstWxOptimizeFeedbackOrderInfo.Add(feedbackOrder);
+                        Invoke(new Action(() =>
+                        {
+                            var rowIndex = this.dgvData5.Rows.Add(
+                                false,
+                                shop.ShopId,
+                                shop.ShopAccount,
+                                "登录",
+                                "进店",
+                                feedbackOrder.orderInfo.imgUrl,
+                                DataGridViewExtension.defaultBitmap,
+                                feedbackOrder.orderInfo.spuId,
+                                feedbackOrder.orderInfo.name,
+                                feedbackOrder.orderInfo.productCnt,
+                                feedbackOrder.orderInfo.skuCode,
+                                feedbackOrder.orderInfo.orderId,
+                                feedbackOrder.province + feedbackOrder.city + feedbackOrder.district,
+                                feedbackOrder.orderTime.IsNullOrZero() ? "" : BaseClass.StampToDateTime(feedbackOrder.orderTime.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"),
+                                feedbackOrder.delivery.deliveryName,
+                                feedbackOrder.waybillId,
+                                feedbackOrder.complainReason,
+                                feedbackOrder.negativeReviewReason,
+                                feedbackOrder.optimizeTime + "\r\n" + feedbackOrder.optimizeWaybillId.Replace("修改物流信息失败", "补发失败"),
+                                "补发",
+                                feedbackOrder.remark.Trim().IsNullOrEmpty() ? "添加备注" : feedbackOrder.remark.Trim()
+                            );
+
+                            var row = dgvData5.Rows[rowIndex];
+                            row.Height = 60;
+                            if (feedbackOrder.optimizeWaybillId.Contains("失败"))
+                                row.Cells["colDgv5OptimizeStatus"].Style.ForeColor = Color.Red;
+                            else if (!feedbackOrder.optimizeTime.IsNullOrEmpty() && !feedbackOrder.optimizeTime.ParseToString().StartsWith(DateTime.Now.ToString("MM-dd")))
+                                row.Cells["colDgv5OptimizeStatus"].Style.ForeColor = Color.Orange;
+                        }));
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        var shopRow = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value.ParseToString() == shop.ShopId);
+                        if (shopRow != null)
+                            shopRow.Cells["colMessage"].Value = ex.Message;
+                    }));
+                }
+            }
+        }
+
         private void btnCancel_Click(object sender, EventArgs e)
         {
             if (this.cancellationTokenSource != null)
@@ -2055,6 +2408,9 @@ namespace TemuKJD.WXForms.ShopForms
                         lblShopName.Text = shop.ShopAccount;
                         lblShopId.Text = shop.ShopId;
                         lblOrderId.Text = orderId;
+                        txtRemark.Text = row.Cells[$"colDgv{dgvNum}Remark"].Value.ParseToString();
+                        if (txtRemark.Text == "添加备注")
+                            txtRemark.Text = "";
                         pnlUpdateRemark.Parent = dgvData.Parent;
                         pnlUpdateRemark.BringToFront();
                         pnlUpdateRemark.Visible = true;
@@ -2084,6 +2440,8 @@ namespace TemuKJD.WXForms.ShopForms
                 return true;
             if (lstWxOptrimizeLinerCgiInfo.Any(o => o.order_id == orderId))
                 return true;
+            if (lstWxOptimizeFeedbackOrderInfo.Any(o => o.orderInfo.orderId == orderId))
+                return true;
             return false;
         }
 
@@ -2212,6 +2570,7 @@ namespace TemuKJD.WXForms.ShopForms
             if (is24)
                 referer = "https://store.weixin.qq.com/shop/setting/ratedetail?type=logistics&key=waybillArriveOntimeRatio_30d&valid=collectIn_24hOrdRatio_30d|waybillArriveOntimeRatio_30d|waybillNegtiveOrdRatio_30d";
 
+            // 该接口开始结束传同一个值，可能是wx页面bug
             string body = @"{""time_query"":{""dateFormat"":2,""dateType"":0,""dateRange"":30,""startMs"":" + endTick + @",""endMs"":" + endTick +
                 @"},""limit"":10,""offset"":" + (Math.Max(0, pageId - 1) * 10) + @",""id"":""ratedetail-wuliu-route-order-table"",""biz"":""store"",""is_std"":""0"",""sort"":[""std_route_rate"",""desc""]}";
 
@@ -2219,6 +2578,20 @@ namespace TemuKJD.WXForms.ShopForms
             return result;
         }
 
+        public static string GetFeedbackOrder(ShopLoginInfo shop, int page, int beginTs, int endTs, bool is24 = false)
+        {
+            string url = "https://store.weixin.qq.com/shop-faas/statistic/dsr/logistics/feedback/order?token=&lang=zh_CN";
+            string referer = "https://store.weixin.qq.com/shop/setting/ratedetail?type=logistics&key=waybillNegtiveOrdRatio_30d&valid=collectIn_48hOrdRatio_30d|waybillArriveOntimeRatio_30d|waybillNegtiveOrdRatio_30d&detail=company";
+            if (is24)
+                referer = "https://store.weixin.qq.com/shop/setting/ratedetail?type=logistics&key=waybillNegtiveOrdRatio_30d&valid=collectIn_24hOrdRatio_30d|waybillArriveOntimeRatio_30d|waybillNegtiveOrdRatio_30d&detail=company";
+
+            string body = @"{""page"":" + page + @",""pageSize"":20,""beginTs"":" + beginTs + @",""endTs"":" + endTs + @"}";
+
+            var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, referer);
+            return result;
+        }
+
+
         public static string orderSearch(ShopLoginInfo shop, string prodTitle, string receiverName)
         {
             string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/list/cgi/orderSearch?token=&lang=zh_CN";

TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx

@@ -186,7 +186,7 @@
   <metadata name="colDgv1Spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="colDgv1OutSn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv1SkuCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv1OrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -303,7 +303,7 @@
   <metadata name="colDgv3Spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="colDgv3ExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv3SkuCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv3OrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -360,16 +360,16 @@
   <metadata name="colDgv4Img.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv4SpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv4ProductName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv4Cnt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv4SkuCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv4OrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -381,7 +381,7 @@
   <metadata name="colDgv4OrderTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv4DeliveryName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv4WaybillId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -405,70 +405,67 @@
   <metadata name="colDgv4Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Check.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5ShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5ShopName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewLinkColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Login.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewLinkColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5InShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5ImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewImageColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Img.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5SpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5ProductName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Cnt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5SkuCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv5OrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Address.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5OrderTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5DeliveryName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="colDgv5WaybillId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDev5ComplaintReason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5NegativeReason.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5OptimizeStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Optimize.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewLinkColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dataGridViewTextBoxColumn24.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colDgv5Remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>

TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.Designer.cs

@@ -105,6 +105,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.colSubUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colOnSaleProductNumber = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colScoreChange = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colPayCnt = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colPayCnt1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colPayCnt7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -1012,6 +1013,7 @@ namespace TemuKJD.WXForms.ShopForms
             this.colSubUser,
             this.colOnSaleProductNumber,
             this.colScore,
+            this.colScoreChange,
             this.colPayCnt,
             this.colPayCnt1,
             this.colPayCnt7,
@@ -1143,6 +1145,14 @@ namespace TemuKJD.WXForms.ShopForms
             this.colScore.ReadOnly = true;
             this.colScore.Width = 50;
             // 
+            // colScoreChange
+            // 
+            this.colScoreChange.FillWeight = 48F;
+            this.colScoreChange.HeaderText = "较前日";
+            this.colScoreChange.Name = "colScoreChange";
+            this.colScoreChange.ReadOnly = true;
+            this.colScoreChange.Width = 50;
+            // 
             // colPayCnt
             // 
             this.colPayCnt.FillWeight = 60F;
@@ -1395,6 +1405,7 @@ namespace TemuKJD.WXForms.ShopForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colSubUser;
         private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleProductNumber;
         private System.Windows.Forms.DataGridViewTextBoxColumn colScore;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colScoreChange;
         private System.Windows.Forms.DataGridViewTextBoxColumn colPayCnt;
         private System.Windows.Forms.DataGridViewTextBoxColumn colPayCnt1;
         private System.Windows.Forms.DataGridViewTextBoxColumn colPayCnt7;

TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.cs

@@ -3,6 +3,7 @@ using AllBase.Extension;
 using AllBase.Helper;
 using AllBase.Model.Config;
 using AllBase.Model.Result;
+using AllBase.Model.Result.WXResult;
 using NaiBa.Util.Extension;
 using NaiBa.Util.Winform.Extension;
 using System;
@@ -158,6 +159,7 @@ namespace TemuKJD.WXForms.ShopForms
                         {
                             row.Cells["colOnSaleProductNumber"].Value = ""; // 商品数量
                             row.Cells["colScore"].Value = ""; // 店铺体验分
+                            row.Cells["colScoreChange"].Value = ""; // 较昨日变化
                             row.Cells["colPayCnt"].Value = "";  // 今日订单
                             row.Cells["colPayCnt7"].Value = ""; // 7日订单
                             row.Cells["colPayCnt30"].Value = "";  // 30日订单
@@ -274,6 +276,12 @@ namespace TemuKJD.WXForms.ShopForms
             var subUserNames = shopEntity.SubUserName.Split(',').Where(su => !string.IsNullOrEmpty(su));
             var subUsers = WXSubAccountShopEditForm.lstAllSubAccount.Where(su => subUserNames.Contains(su.user_name));
 
+            decimal? scoreChange = null;
+            if (statistics.scoreRetInfo?.dsrScore?.valueList?.Count > 1)
+                scoreChange = statistics.scoreRetInfo?.dsrScore?.valueList[0].value - statistics.scoreRetInfo?.dsrScore?.valueList[1].value; // 较昨日变化
+            //string scoreChangeStr = scoreChange == null ? "" : scoreChange.Value.ToString("+0.00;−0.00");
+            string scoreChangeStr = scoreChange == null ? "" : scoreChange.Value.ToString("+0.00;-0.00");
+
             if (row == null)
             {
                 int rowId = this.dgvShop.Rows.Add(
@@ -288,6 +296,7 @@ namespace TemuKJD.WXForms.ShopForms
                     string.Join(",", subUsers.Select(s => s.nick_name)),
                     statistics.ProdCount.ParseToNullableInt(), // 在售商品
                     statistics.curScoreValue.ParseToNullableDecimal(), // 店铺体验分
+                    scoreChange, // 较昨日变化
                     statistics.WxShopSaleInfoToday.pay_order_cnt, // 今日订单
                     statistics.WxShopSaleInfo1Day.pay_order_cnt, // 昨日订单
                     statistics.WxShopSaleInfo7Day.pay_order_cnt, // 7日订单
@@ -332,6 +341,7 @@ namespace TemuKJD.WXForms.ShopForms
                 row.Cells["colSubUser"].Value = string.Join(",", subUsers.Select(s => s.nick_name));
                 row.Cells["colOnSaleProductNumber"].Value = statistics.ProdCount.ParseToNullableInt(); // 商品数量
                 row.Cells["colScore"].Value = statistics.curScoreValue.ParseToNullableDecimal(); // 店铺体验分
+                row.Cells["colScoreChange"].Value = scoreChange; // 较昨日变化
                 row.Cells["colPayCnt"].Value = statistics.WxShopSaleInfoToday.pay_order_cnt; // 今日订单
                 row.Cells["colPayCnt1"].Value = statistics.WxShopSaleInfo1Day.pay_order_cnt; // 昨日订单
                 row.Cells["colPayCnt7"].Value = statistics.WxShopSaleInfo7Day.pay_order_cnt; // 7日订单
@@ -354,6 +364,14 @@ namespace TemuKJD.WXForms.ShopForms
                 row.Cells["colDepositBalance"].Value = statistics.WxShopAmount.DepositBalance * 0.01m; ; // 保证金
 
             }
+
+            row.Cells["colScore"].Style.ForeColor = DefaultForeColor;
+            if (statistics.scoreRetInfo?.dsrScore?.level == 3)
+                row.Cells["colScore"].Style.ForeColor = Color.DarkGreen; // Color.Green;
+            if (statistics.scoreRetInfo?.dsrScore?.level == 2)
+                row.Cells["colScore"].Style.ForeColor = Color.ForestGreen; // Color.MediumSeaGreen;
+            if (statistics.scoreRetInfo?.dsrScore?.level == 1)
+                row.Cells["colScore"].Style.ForeColor = Color.Red;
         }
 
         private void GetShopStatistics(ShopLoginInfo shop, WxShopSaleStatisticsGroup statistics)
@@ -371,6 +389,7 @@ namespace TemuKJD.WXForms.ShopForms
                     if (shopScoreRst.Contains("\"code\":0"))
                     {
                         statistics.curScoreValue = BaseRegex.GetDecimalJson(ref shopScoreRst, "curValue");
+                        statistics.scoreRetInfo = JsonHelper.DeserializeJsonToObject<DSRShopScoreRetInfo>(JsonHelper.JObjectParse(shopScoreRst)["dsrScoreRet"].ParseToString());
                     }
                     else
                     {
@@ -764,9 +783,9 @@ namespace TemuKJD.WXForms.ShopForms
                     statistics.WxShopSaleInfo1Day.LastRefreshDate = DateTime.MinValue;
                     statistics.WxShopSaleInfo7Day.LastRefreshDate = DateTime.MinValue;
                     statistics.WxShopSaleInfo30Day.LastRefreshDate = DateTime.MinValue;
+                    statistics.lastRefreshDate = DateTime.MinValue;
                 }
                 //this.lstSubOrderInfo.RemoveAll(o => o.supplierId.ParseToString() == shop.ShopId);
-                
             }
 
             this.pbLoading.Visible = true;

TEMUKJD/WXForms/ShopForms/WxShopStatisticsForm.resx

@@ -150,6 +150,9 @@
   <metadata name="colScore.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colScoreChange.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colPayCnt.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs

@@ -921,6 +921,7 @@ namespace TemuKJD.WXForms.TalkForms
                     if (cancellationTokenSource.IsCancellationRequested)
                         break;
 
+                    CheckBuyerLogin(new List<BuyerLoginInfo>() { buyer });
                     if (buyer.status != "在线")
                         continue;
 
@@ -954,11 +955,20 @@ namespace TemuKJD.WXForms.TalkForms
                         Thread.Sleep(Randomx.GetId(2000, 3000));
 
                         int top = 0;
+                        int times = 0;
                         while (currentReadBuyer == readBuyer)
                         {
                             if (cancellationTokenSource.IsCancellationRequested)
                                 break;
 
+                            if (times % 100 == 0)
+                            {
+                                CheckBuyerLogin(new List<BuyerLoginInfo>() { buyer });
+                            }
+                            if (buyer.status != "在线")
+                                break;
+                            times++;
+
                             Invoke(new Action(() => { buyer.browser.BringToFront(); }));
 
                             top += Randomx.GetId(450, 600);
@@ -999,6 +1009,14 @@ namespace TemuKJD.WXForms.TalkForms
                             if (cancellationTokenSource.IsCancellationRequested)
                                 break;
 
+                            if (times % 100 == 0)
+                            {
+                                CheckBuyerLogin(new List<BuyerLoginInfo>() { buyer });
+                            }
+                            if (buyer.status != "在线")
+                                break;
+                            times++;
+
                             Invoke(new Action(() => { buyer.browser.BringToFront(); }));
 
                             top += Randomx.GetId(450, 600);
@@ -1039,6 +1057,14 @@ namespace TemuKJD.WXForms.TalkForms
                             if (cancellationTokenSource.IsCancellationRequested)
                                 break;
 
+                            if (times % 100 == 0)
+                            {
+                                CheckBuyerLogin(new List<BuyerLoginInfo>() { buyer });
+                            }
+                            if (buyer.status != "在线")
+                                break;
+                            times++;
+
                             Invoke(new Action(() => { buyer.browser.BringToFront(); }));
 
                             top += Randomx.GetId(450, 600);