diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 4df9bd4..d25bd7f 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 1176;
+ public static int VersionCount = 1180;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
@@ -318,6 +318,7 @@ namespace AllBase
public static string UserAuthority = "";
public static string ParentAuthority = "";
public static int Points = 0;
+ public static int ShopPointsPerMonth = 30;
public static decimal? AuthorizedAmount = null;
///
/// 注册昵称
diff --git a/AllBase/Model/Result/ShopLoginInfo.cs b/AllBase/Model/Result/ShopLoginInfo.cs
index c75fa88..7f5e525 100644
--- a/AllBase/Model/Result/ShopLoginInfo.cs
+++ b/AllBase/Model/Result/ShopLoginInfo.cs
@@ -141,7 +141,7 @@ namespace AllBase.Model.Result
///
/// 子账户列表（抖店用）
///
- public List ShopSubAccountList { get; } = new List();
+ public List ShopSubAccountList { get; } = new List();
public int OnlineProductCount { get; set; } = -1;
public int OfflineProductCount { get; set; } = -1;
@@ -232,7 +232,7 @@ namespace AllBase.Model.Result
public string ApiAuthStatus { get; set; } = "未授权";
}
- public class SubAccountInfo
+ public class UserAccountInfo
{
public int id { get; set; }
public string user_name { get; set; }
@@ -287,9 +287,13 @@ namespace AllBase.Model.Result
/// 用户积分
///
public int points { get; set; }
+ ///
+ /// 店铺每续费一个月需要的积分
+ ///
+ public int shop_points_per_month { get; set; }
}
- public class ShopSubAccountInfo : SubAccountInfo
+ public class UserSubAccountInfo : UserAccountInfo
{
public string shop_login_name { get; set; }
public string sub_user_id { get { return id.ToString(); } set { id = value.ParseToInt(); } }
diff --git a/AllBase/Model/Result/WXResult/WXGetEditProductInfoLite.cs b/AllBase/Model/Result/WXResult/WXGetEditProductInfoLite.cs
index 2fd3e70..058170c 100644
--- a/AllBase/Model/Result/WXResult/WXGetEditProductInfoLite.cs
+++ b/AllBase/Model/Result/WXResult/WXGetEditProductInfoLite.cs
@@ -28,8 +28,8 @@ namespace AllBase.Model.Result.WXResult
public string countyName { get; set; } // "肥西县",
public string detailInfo { get; set; } // "蜀山区长江西路某某号某某单元",
public string telNumber { get; set; } // "18388888888",
- public int? lat { get; set; } // 0,
- public int? lng { get; set; } // 0
+ public decimal? lat { get; set; } // 0,
+ public decimal? lng { get; set; } // 0
}
public class WXProductInfo
diff --git a/AllBase/Model/Result/WXResult/WXLiveObjectInfo.cs b/AllBase/Model/Result/WXResult/WXLiveObjectInfo.cs
index 9039b6c..c0fb77c 100644
--- a/AllBase/Model/Result/WXResult/WXLiveObjectInfo.cs
+++ b/AllBase/Model/Result/WXResult/WXLiveObjectInfo.cs
@@ -40,6 +40,9 @@ namespace AllBase.Model.Result.WXResult
public int? total { get; set; } // 14
}
+ ///
+ /// 直播带货
+ ///
public class WXLiveProduct
{
public string spuId { get; set; } // "10000272708183",
@@ -55,4 +58,41 @@ namespace AllBase.Model.Result.WXResult
public string spuQrCode { get; set; } // "https://liteapp.weixin.qq.com/q/ABMNbs?shopId=10000272708183&p_page_type=qr",
public string spuBindTalentUin { get; set; } // "1"
}
+
+ public class WXFeedObjectInfoResult
+ {
+ public int? code { get; set; } // 0
+ public List list { get; set; }
+ public int? total { get; set; } // 1
+ }
+
+ ///
+ /// 短视频带货商品
+ ///
+ public class WXFeedObjectInfo
+ {
+ public string objectId { get; set; } // "14934758934552381684",
+ public string feedObjectDescription { get; set; } // "一家四口三刷秦皇岛渔岛，吃住玩交通全攻略来啦！二胎亲子游玩全干货！#渔岛海洋度假区 #在渔岛五一解锁海外同款度假体验 #渔岛·渤海湾海边版奈良 #渔岛刷新海边度假认知 #秦皇岛旅游攻略\n",
+ public string feedObjectImg { get; set; } // "https://finder.video.qq.com/251/20304/stodownload?encfilekey=rjD5jyTuFrIpZ2ibE8T7YmwgiahniaXswqzbxOalG0a5M7Rs3tS4iaibJRL1NMOYpQDzxOVlHjvCfeNQXJGSo552ERqgXoR4YTA4gsqPbDm3cZdzicib75L2ehOfw&token=KkOFht0mCXmGhX87SMcE4kGEckB9ezJmdIalWbx8ztDia9gMrKGykBPNMibBm7TtAkNibEsDrPprfsJFsyXHSUxHTC91qSSUvQXmcM8FiaqwkT01pzsPC3nZtiaMsUwg6ibPx9gxyd1EtN4MU6Q0K7G4GOATGt2BeiauiarwHDr6GaicWw5vUM09k0xyxSSWz7UJiagFH4z4sdjSCS4ic0yVU3muXMq7g&bizid=1023&dotrans=0&hy=SH&idx=1&m=&uzid=1&wxampicformat=503&picformat=200",
+ public string feedObjectStartTime { get; set; } // "1780362002",
+ public string feedShortUrl { get; set; } // "https://weixin.qq.com/sph/AeWh6St8E",
+ public string spuId { get; set; } // "15000023413538",
+ public string spuName { get; set; } // "度假豪华标准间 1晚套餐",
+ public string spuPrice { get; set; } // "55900",
+ public string spuImgUrl { get; set; } // "https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SH/reserved/6a1701d10004ce421a75246d127c0d15000000a100004f50?imageView2/1/w/800/h/800/q/50",
+ public string spuAppid { get; set; } // "wx50368c20c5ca83b4",
+ public string spuShopNickname { get; set; } // "携程旅行网",
+ public string spuShopHeadimgUrl { get; set; } // "http://mmbiz.qpic.cn/sz_mmbiz_png/3ArQz03du0D9V4DKibibic8OUSezicteSoOH1Rvg5TharHxMwZwD65Ohm2S80kP0XYr8iaib4P3hOftp6cZdevIcxKLA/0?wx_fmt=png/0",
+ public string spuSrcId { get; set; } // "14000756924433",
+ public string spuMonthSales { get; set; } // "0",
+ public string spuStatus { get; set; } // "4",
+ public string spuQrCode { get; set; } // "https://mp.weixin.qq.com/a/~~6yqyngkRqkA~fRMB5Fct7gwPDzUWrLze8g~~",
+ public string spuBindTalentUin { get; set; } // "1",
+ public string finderxshortvideoPayGmv { get; set; } // "0",
+ public string finderxshortvideoFavoriteCnt { get; set; } // "2",
+ public string finderxshortvideoCommentCnt { get; set; } // "0",
+ public string finderxshortvideoShareCnt { get; set; } // "1",
+ public string finderxshortvideoLikeCnt { get; set; } // "2",
+ public string shortvideoPayGmvRange { get; set; } // "0"
+ }
}
diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
index f8d7a03..67f886a 100644
--- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
+++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs
@@ -701,9 +701,9 @@ namespace KJD_Web.BLL.BXX
if (!string.IsNullOrEmpty(has_wx_cat))
{
if (has_wx_cat.ToLower() == "true")
- where += " and wx_cat_leaf is NOT NULL";
+ where += " and wx_cat_leaf is NOT NULL and wx_cat_3 IS NOT NULL";
else
- where += " and wx_cat_leaf is NULL";
+ where += " and (wx_cat_leaf is NULL OR wx_cat_3 IS NULL)";
}
if (!string.IsNullOrEmpty(send_to_out_server))
where += " and send_to_out_server=" + send_to_out_server;
@@ -721,10 +721,10 @@ namespace KJD_Web.BLL.BXX
// where += " and wx_cat_leaf IS NOT NULL and send_to_out_server=1 and delivery_fee_set=1 and after_sale_set=1 and distribution_set=1";
//else
// where += " and (wx_cat_leaf IS NULL or send_to_out_server=0 or delivery_fee_set=0 or after_sale_set=0 or distribution_set=0)";
- if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "已设置")
- where += " and wx_cat_leaf IS NOT NULL and send_to_out_server=1 and distribution_set=1";
+ if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "是" || is_supplier_prod_ok == "已设置")
+ where += " and wx_cat_leaf IS NOT NULL and send_to_out_server IN (1,127) and distribution_set IN (1,127)";
else
- where += " and (wx_cat_leaf IS NULL or send_to_out_server!=1 or distribution_set=0)";
+ where += " and (wx_cat_leaf IS NULL or send_to_out_server NOT IN (1,127) or distribution_set NOT IN (1,127))";
}
if (!string.IsNullOrEmpty(real_coid))
{
@@ -1296,7 +1296,7 @@ namespace KJD_Web.BLL.BXX
string sql = "SELECT DISTINCT p.group FROM `bxx`.`product` p where p.is_del=0";
- string where = "";
+ string where = " AND p.group NOT LIKE '用户%'";
if (!string.IsNullOrEmpty(product_get_type))
where += " and p.product_get_type in ('" + product_get_type.Replace(",", "','") + "')";
if (!string.IsNullOrEmpty(add_user_name))
@@ -1644,9 +1644,9 @@ namespace KJD_Web.BLL.BXX
if (!string.IsNullOrEmpty(is_supplier_prod_ok))
{
if (is_supplier_prod_ok == "1" || is_supplier_prod_ok == "是" || is_supplier_prod_ok == "已设置")
- where += " and wx_cat_leaf IS NOT NULL and send_to_out_server=1 and distribution_set=1";
+ where += " AND wx_cat_leaf IS NOT NULL AND send_to_out_server IN (1,127) and distribution_set IN (1,127)";
else
- where += " and (wx_cat_leaf IS NULL or send_to_out_server!=1 or distribution_set=0)";
+ where += " AND (wx_cat_leaf IS NULL OR send_to_out_server NOT IN (1,127) OR distribution_set NOT IN (1,127))";
}
if (!add_days_less.IsNullOrZero())
{
diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
index c414801..0f0a232 100644
--- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
+++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs
@@ -91,6 +91,7 @@ namespace KJD_Web.BLL.WXXD
authority = row.Table.Columns.Contains("authority") ? row["authority"].ParseToString() : "",
parent_user_name = row["parent_user_name"].ToString(),
points = row.Table.Columns.Contains("points") ? row["points"].ParseToInt() : 0,
+ shop_points_per_month = row.Table.Columns.Contains("shop_points_per_month") ? row["shop_points_per_month"].ParseToInt() : 30,
};
var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
// 子账号积分用户权限跟随
@@ -164,8 +165,8 @@ namespace KJD_Web.BLL.WXXD
return "{\"code\":500,\"msg\":\"用户名已存在\"}";
}
- sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,parent_user_name,authority,add_time,mdy_time) " +
- "values ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" +
+ sql = "INSERT into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,parent_user_name,authority,add_time,mdy_time) " +
+ "VALUES ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" +
group_id + "','" + company_name + "','" + notes + "','" + parent_user_name + "','" + authority + "','" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');";
@@ -328,6 +329,11 @@ namespace KJD_Web.BLL.WXXD
var group_id = RegexUtils.GetStringQuery(ref inputData, "group_id")?.Replace("'", "\\'");
var search = RegexUtils.GetStringQuery(ref inputData, "search")?.Replace("'", "\\'");
var sa_level = RegexUtils.GetStringQuery(ref inputData, "sa_level")?.Replace("'", "\\'");
+ var search_user_name = RegexUtils.GetStringQuery(ref inputData, "search_user_name")?.Replace("'", "\\'");
+ var search_nick_name = RegexUtils.GetStringQuery(ref inputData, "search_nick_name")?.Replace("'", "\\'");
+ var search_company_name = RegexUtils.GetStringQuery(ref inputData, "search_company_name")?.Replace("'", "\\'");
+ var search_authoritys_and = RegexUtils.GetStringQuery(ref inputData, "search_authoritys_and")?.Replace("'", "\\'");
+ var search_authoritys_or = RegexUtils.GetStringQuery(ref inputData, "search_authoritys_or")?.Replace("'", "\\'");
int r2 = 0;
int.TryParse(RegexUtils.GetStringQuery(ref inputData, "r2"), out r2);
@@ -336,15 +342,47 @@ namespace KJD_Web.BLL.WXXD
//string sql = "select * from wxxd.user where group_id=3";
string sql = "select u.*,uu.authority as main_authority from wxxd.user u " +
"LEFT JOIN wxxd.user uu ON uu.user_name=u.parent_user_name WHERE 1=1";
+ string where = "";
if (!string.IsNullOrEmpty(group_id))
- sql += " and u.group_id=" + group_id;
+ where += " AND u.group_id=" + group_id;
if (!string.IsNullOrEmpty(sa_level))
- sql += " and u.sa_level=" + sa_level;
+ where += " AND u.sa_level=" + sa_level;
+ if (!string.IsNullOrEmpty(search_user_name))
+ where += " AND u.user_name like '%" + search_user_name + "%'";
+ if (!string.IsNullOrEmpty(search_nick_name))
+ where += " AND u.nick_name like '%" + search_nick_name + "%'";
+ if (!string.IsNullOrEmpty(search_company_name))
+ where += " AND u.company_name like '%" + search_company_name + "%'";
+ if (!string.IsNullOrEmpty(search_authoritys_and))
+ {
+ var search_authority_list = search_authoritys_and.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
+ foreach (var auth in search_authority_list)
+ {
+ where += " AND u.authority like '%" + auth + "%'";
+ }
+ }
+ if (!string.IsNullOrEmpty(search_authoritys_or))
+ {
+ where += " AND (";
+ var search_authority_list = search_authoritys_or.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
+ int index = 0;
+ foreach (var auth in search_authority_list)
+ {
+ if (index == 0)
+ where += " u.authority like '%" + auth + "%'";
+ else
+ where += " or u.authority like '%" + auth + "%'";
+ index++;
+ }
+ where += " )";
+ }
+
if (!string.IsNullOrEmpty(search))
- sql += " and (u.user_name like '%" + search +
+ where += " AND (u.user_name like '%" + search +
"%' or u.nick_name like '%" + search +
"%' or u.company_name like '%" + search + "%')";
- sql += " order by u.id desc";
+ sql += where;
+ sql += " ORDER BY u.id desc";
var dt = mySql.ExecuteDataTable(sql);
mySql.Close();
@@ -370,6 +408,7 @@ namespace KJD_Web.BLL.WXXD
sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
authority = row.Table.Columns.Contains("authority") ? row["authority"].ParseToString() : "",
points = row.Table.Columns.Contains("points") ? row["points"].ParseToInt() : 0,
+ shop_points_per_month = row.Table.Columns.Contains("shop_points_per_month") ? row["shop_points_per_month"].ParseToInt() : 30,
};
var main_authority = row.Table.Columns.Contains("main_authority") ? row["main_authority"].ParseToString() : "";
// 子账号积分用户权限跟随
@@ -416,8 +455,10 @@ namespace KJD_Web.BLL.WXXD
var notes = RegexUtils.GetStringQuery(ref inputData, "notes")?.Replace("'", "\\'");
var sa_level = RegexUtils.GetStringQuery(ref inputData, "sa_level")?.Replace("'", "\\'");
var authority = RegexUtils.GetStringQuery(ref inputData, "authority")?.Replace("'", "\\'");
- int r2 = 0;
- int.TryParse(RegexUtils.GetStringQuery(ref inputData, "r2"), out r2);
+
+ var shop_points_per_month = RegexUtils.GetStringQuery(ref inputData, "shop_points_per_month")?.Replace("'", "\\'");
+ if (shop_points_per_month.ParseToInt() <= 30) // 充值用户月积分消耗点数，最小30
+ shop_points_per_month = "30";
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
@@ -430,9 +471,10 @@ namespace KJD_Web.BLL.WXXD
return "{\"code\":500,\"msg\":\"用户名已存在\"}";
}
- sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,sa_level,authority,add_time,mdy_time) " +
+ sql = "insert into wxxd.user (nick_name,user_name,mobile,password,card_id,group_id,company_name,notes,sa_level,authority," +
+ "shop_points_per_month,add_time,mdy_time) " +
"values ('" + nick_name + "','" + user_name + "','" + mobile + "','" + password + "','" + card_id + "','" +
- group_id + "','" + company_name + "','" + notes + "'," + sa_level + ",'" + authority + "','" +
+ group_id + "','" + company_name + "','" + notes + "'," + sa_level + ",'" + authority + "'," + shop_points_per_month + ",'" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" +
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');";
var rst = mySql.ExecuteNonQuery(sql);
@@ -463,8 +505,7 @@ namespace KJD_Web.BLL.WXXD
var notes = RegexUtils.GetStringQuery(ref inputData, "notes")?.Replace("'", "\\'");
var sa_level = RegexUtils.GetStringQuery(ref inputData, "sa_level")?.Replace("'", "\\'");
var authority = RegexUtils.GetStringQuery(ref inputData, "authority")?.Replace("'", "\\'");
- int r2 = 0;
- int.TryParse(RegexUtils.GetStringQuery(ref inputData, "r2"), out r2);
+ var shop_points_per_month = RegexUtils.GetStringQuery(ref inputData, "shop_points_per_month")?.Replace("'", "\\'");
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
MysqlUtils mySql = new MysqlUtils(conn);
@@ -492,6 +533,8 @@ namespace KJD_Web.BLL.WXXD
sql += " sa_level=" + sa_level + ",";
if (authority != null)
sql += " authority='" + authority + "',";
+ if (shop_points_per_month != null)
+ sql += " shop_points_per_month=" + shop_points_per_month + ",";
sql = sql.TrimEnd(',');
sql += " where id=" + id + "";
@@ -614,6 +657,7 @@ namespace KJD_Web.BLL.WXXD
string sql;
int userPoints = 0;
int newUserPoints = 0;
+ int shopPointsPerMonth = 30;
#region 计算是否余额不足
sql = "SELECT points FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
@@ -627,11 +671,21 @@ namespace KJD_Web.BLL.WXXD
}
if (option_type == "续费")
{
- if (delta_points <= 0 || delta_points % 30 > 0)
+ sql = "SELECT shop_points_per_month FROM `wxxd`.`user` WHERE user_name='" + user_name + "'";
+ shopPointsPerMonth = mySql.ExecuteFirstInt(sql); // 店铺续费一个月的点数，默认30，可以设置为其他值
+ if (!string.IsNullOrEmpty(mySql.Message))
{
mySql.RollBack();
mySql.Close();
- return "{\"code\":501,\"msg\":\"续费点数必须是30的整倍数\"}";
+ return "{\"code\":501,\"msg\":\"" + mySql.Message + "\"}";
+ }
+ shopPointsPerMonth = Math.Max(30, shopPointsPerMonth);
+
+ if (delta_points <= 0 || delta_points % shopPointsPerMonth > 0)
+ {
+ mySql.RollBack();
+ mySql.Close();
+ return "{\"code\":501,\"msg\":\"续费点数必须是" + shopPointsPerMonth + "的整倍数\"}";
}
else if (userPoints < delta_points)
{
@@ -709,7 +763,7 @@ namespace KJD_Web.BLL.WXXD
if (expireTime == 0)
{
- newExpireTime = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(delta_points.ParseToInt() / 30));
+ newExpireTime = TimeUtils.DateTimeToTimestampSeconds(DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth));
sql = " INSERT INTO `wxxd`.`user_points_shop_expire` (shop_id,expire_time)" +
" VALUES ('" + shop_id + "'," + newExpireTime + ");";
}
@@ -717,9 +771,9 @@ namespace KJD_Web.BLL.WXXD
{
DateTime expireDateTime = TimeUtils.StampToDateTime(expireTime);
if (expireDateTime < DateTime.Now)
- expireDateTime = DateTime.Now.AddMonths(delta_points.ParseToInt() / 30);
+ expireDateTime = DateTime.Now.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth);
else
- expireDateTime = expireDateTime.AddMonths(delta_points.ParseToInt() / 30);
+ expireDateTime = expireDateTime.AddMonths(delta_points.ParseToInt() / shopPointsPerMonth);
newExpireTime = TimeUtils.DateTimeToTimestampSeconds(expireDateTime);
sql = "UPDATE `wxxd`.`user_points_shop_expire` set expire_time=" + newExpireTime + " WHERE shop_id='" + shop_id + "' AND expire_time=" + expireTime;
diff --git a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs
index 559ef7a..28145a3 100644
--- a/KJDService/KJD_WebService/Model/UserLoginResultParam.cs
+++ b/KJDService/KJD_WebService/Model/UserLoginResultParam.cs
@@ -70,5 +70,9 @@ namespace KJD_Web.Model
/// 用户积分点数
///
public int points { get; set; }
+ ///
+ /// 单店铺续费1个月消耗的点数
+ ///
+ public int shop_points_per_month { get; set; }
}
}
\ No newline at end of file
diff --git a/TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs b/TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs
index cee2daf..563d734 100644
--- a/TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs
+++ b/TEMUKJD/BLL/Wx/WxPlatformRecommendProdManage.cs
@@ -363,11 +363,12 @@ namespace TemuKJD.BLL.Wx
var prodIdLst = wxProdObjList.Select(p => p["productId"].ParseToString()).ToList();
if (prodIdLst.Count == 0)
{
- // 取到商品页，直接跳出
+ // 取到无商品页，直接跳出
i = 999999;
break;
}
- var prodMetricRst = getProductMetricList(shop, prodIdLst, i + 1);
+ //var prodMetricRst = getProductMetricList(shop, prodIdLst, i + 1);
+ var prodMetricRst = getProductMetricList(shop, prodIdLst);
if (!prodMetricRst.Contains("\"code\":0"))
{
WXShopListForm.CheckShopLogin(shop);
@@ -392,9 +393,10 @@ namespace TemuKJD.BLL.Wx
List recommendProds = new List();
foreach (var wxProdObj in wxProdObjList)
{
- WXPlatformRecommendProdInfo recommendProd = new WXPlatformRecommendProdInfo();
var prodStr = JsonHelper.SerializeObject(wxProdObj);
var productMetricStr = JsonHelper.SerializeObject(productMetric);
+
+ WXPlatformRecommendProdInfo recommendProd = new WXPlatformRecommendProdInfo();
recommendProd.product_id = wxProdObj["productId"].ParseToString();
recommendProd.title = wxProdObj["title"].ParseToString();
var ViewUvCnt = productMetric.rowsMap
@@ -643,11 +645,11 @@ namespace TemuKJD.BLL.Wx
return result;
}
- public static string searchProductWithSaleStatus(ShopLoginInfo shop, int pageNum = 1, int pageSize = 50)
+ public static string searchProductWithSaleStatus(ShopLoginInfo shop, int pageNum = 1, int pageSize = 50, int status = 5)
{
// 在售
string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeproductcore/cgi/goods/searchProduct?token=&lang=zh_CN&pageSize=" + pageSize +
- "&productStatus[]=-1&productSource=[1,16,32]&searchSource=1&useNew=true&fromProductManager=1&pageNum=" + pageNum + "&status[]=5&sortType=6";
+ "&productStatus[]=-1&productSource=[1,16,32]&searchSource=1&useNew=true&fromProductManager=1&pageNum=" + pageNum + "&status[]=" + status + "&sortType=6";
// 全部商品
//string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeproductcore/cgi/goods/searchProduct?token=&lang=zh_CN&pageSize=" + pageSize +
// "&productStatus[]=-1&productSource=[1,16,32]&searchSource=1&useNew=true&fromProductManager=1&pageNum=" + pageNum + "&status[]=-1&sortType=6";
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index ba3a4e7..6c7422b 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -173,10 +173,10 @@
JstBanPlatformForm.cs
-
+
Form
-
+
WXUserCollectAuthProdEditNotesForm.cs
@@ -276,6 +276,12 @@
VDianUploadProductForm.cs
+
+ Form
+
+
+ WXAdminAccountSelectForm.cs
+
Form
@@ -1327,7 +1333,7 @@
JstBanPlatformForm.cs
-
+
WXUserCollectAuthProdEditNotesForm.cs
@@ -1378,6 +1384,9 @@
VDianUploadProductForm.cs
+
+ WXAdminAccountSelectForm.cs
+
WXAdminSetTopUpQrCodeForm.cs
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs
index 8484f65..cc3c866 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminAccountForm.cs
@@ -17,7 +17,7 @@ namespace TemuKJD.KJDForms.AdminForms
{
public partial class AdminAccountForm : BaseForm
{
- public static List AllUsers { get; set; } = new List();
+ public static List AllUsers { get; set; } = new List();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
@@ -127,7 +127,7 @@ namespace TemuKJD.KJDForms.AdminForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopAddSubSaForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopAddSubSaForm.cs
index 9a035bd..c5457dd 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminShopAddSubSaForm.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminShopAddSubSaForm.cs
@@ -19,7 +19,7 @@ namespace TemuKJD.KJDForms.AdminForms
{
List lstShopLoginName = new List();
- List lstSubSa = new List();
+ List lstSubSa = new List();
public AdminShopAddSubSaForm(List ShopSelectIds = null)
{
InitializeComponent();
@@ -79,7 +79,7 @@ namespace TemuKJD.KJDForms.AdminForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectSetSubSaForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectSetSubSaForm.cs
index a7b87ba..dce3d5f 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectSetSubSaForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectSetSubSaForm.cs
@@ -28,7 +28,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
List lstDbProdSelect = new List();
SetSubSaType setSubSaType;
- List lstSubSa = new List();
+ List lstSubSa = new List();
public DbProductSelectSetSubSaForm(List dbProdSelectLst, SetSubSaType type = SetSubSaType.DbProduct)
{
InitializeComponent();
@@ -145,7 +145,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs
index ec1a6d0..3b35b49 100644
--- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs
@@ -855,7 +855,7 @@ namespace TemuKJD.KJDForms.ShopForms
//if (result?.Contains("\"code\":200") == true)
//{
// var jObj = JObject.Parse(result);
- // List shopSubAccountList = JsonHelper.DeserializeJsonToList(jObj["data"].ToString());
+ // List shopSubAccountList = JsonHelper.DeserializeJsonToList(jObj["data"].ToString());
// foreach (var shop in GlobalConfig.DouShopLoginList)
// {
// shop.ShopSubAccountList.Clear();
@@ -867,7 +867,7 @@ namespace TemuKJD.KJDForms.ShopForms
shop.ShopSubAccountList.Clear();
if (!string.IsNullOrWhiteSpace(shop.SubUserName))
{
- ShopSubAccountInfo subAccount = new ShopSubAccountInfo();
+ UserSubAccountInfo subAccount = new UserSubAccountInfo();
subAccount.sub_user_name = shop.SubUserName;
subAccount.user_name = shop.SubUserName;
subAccount.shop_login_name = shop.LoginName;
diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs
index c550ec3..9d39d83 100644
--- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs
@@ -16,7 +16,7 @@ namespace TemuKJD.KJDForms.ShopForms
{
public partial class SubAccountListForm : BaseForm
{
- public static List AllUsers { get; set; } = new List();
+ public static List AllUsers { get; set; } = new List();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
public SubAccountListForm()
@@ -120,7 +120,7 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs
index f8e27d1..4526f63 100644
--- a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs
+++ b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs
@@ -17,9 +17,9 @@ namespace TemuKJD.KJDForms.ShopForms
public partial class SubAccountShopEditForm : BaseGeneralForm
{
ShopLoginInfo shop = null;
- public List AllSubAccountList { get; set; } = new List();
- public List ShopSubAccountList { get; set; } = new List();
- public List NotShopSubAccountList { get; set; } = new List();
+ public List AllSubAccountList { get; set; } = new List();
+ public List ShopSubAccountList { get; set; } = new List();
+ public List NotShopSubAccountList { get; set; } = new List();
public SubAccountShopEditForm(ShopLoginInfo _shop)
{
InitializeComponent();
@@ -51,7 +51,7 @@ namespace TemuKJD.KJDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
@@ -134,8 +134,8 @@ namespace TemuKJD.KJDForms.ShopForms
private void btnOk_Click(object sender, EventArgs e)
{
- List AddUsers = new List();
- List DeleteUsers = new List();
+ List AddUsers = new List();
+ List DeleteUsers = new List();
foreach (Control c in this.flpNotSubAccount.Controls)
{
var co = c as UcSubAccount;
diff --git a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs
index 084127d..f57af1b 100644
--- a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs
+++ b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs
@@ -13,14 +13,14 @@ namespace TemuKJD.KJDForms.ShopForms
{
public partial class UcSubAccount : UserControl
{
- public ShopSubAccountInfo subAccount = null;
+ public UserSubAccountInfo subAccount = null;
public delegate void SubAcountDelegate(object obj);
public event SubAcountDelegate AddSubAcountEvent;
public event SubAcountDelegate RemoveSubAcountEvent;
- public UcSubAccount(ShopSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
+ public UcSubAccount(UserSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
{
InitializeComponent();
subAccount = _subAccount;
diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.cs
index 279f5d8..1096760 100644
--- a/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.cs
+++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminAccountForm.cs
@@ -17,7 +17,7 @@ namespace TemuKJD.PDDForms.AdminForms
public partial class PDDAdminAccountForm
: BaseForm
{
- public static List AllUsers { get; set; } = new List();
+ public static List AllUsers { get; set; } = new List();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
@@ -134,7 +134,7 @@ namespace TemuKJD.PDDForms.AdminForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopAddSubSaForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopAddSubSaForm.cs
index 1da9142..91d1ffd 100644
--- a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopAddSubSaForm.cs
+++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopAddSubSaForm.cs
@@ -19,7 +19,7 @@ namespace TemuKJD.PDDForms.AdminForms
{
List lstShopLoginName = new List();
- List lstSubSa = new List();
+ List lstSubSa = new List();
public PDDAdminShopAddSubSaForm(List ShopSelectIds = null)
{
InitializeComponent();
@@ -79,7 +79,7 @@ namespace TemuKJD.PDDForms.AdminForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.cs
index 695ab43..74ca05c 100644
--- a/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.cs
+++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminShopListForm.cs
@@ -27,7 +27,7 @@ namespace TemuKJD.PDDForms.AdminForms
public partial class PDDAdminShopListForm : BaseForm
{
static PDDAdminShopListForm inst = null;
- public SubAccountInfo UserAccountInfo { get; set; } = null;
+ public UserAccountInfo UserAccountInfo { get; set; } = null;
public static PDDAdminShopListForm Instance
{
get { if (inst == null) inst = new PDDAdminShopListForm(); return inst; }
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
index d21d393..0bbfe07 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
@@ -91,7 +91,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.dtpStart = new System.Windows.Forms.DateTimePicker();
this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.cmbCat2 = new System.Windows.Forms.ComboBox();
- this.chkNoUserProduct = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.label16 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.txtSecretStyleCode = new System.Windows.Forms.TextBox();
@@ -127,7 +126,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
this.label11 = new System.Windows.Forms.Label();
this.cmbSpProdType = new System.Windows.Forms.ComboBox();
+ this.panel1 = new System.Windows.Forms.Panel();
this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkNoUserProduct = 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();
@@ -178,6 +179,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+ this.btnAddUserProd = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -189,6 +191,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.tabPage2.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
+ this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
@@ -247,6 +250,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
// tabPage1
//
+ this.tabPage1.Controls.Add(this.btnAddUserProd);
this.tabPage1.Controls.Add(this.btnTitleFission);
this.tabPage1.Controls.Add(this.btnSetGroup);
this.tabPage1.Controls.Add(this.btnDelSelect);
@@ -270,7 +274,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnTitleFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTitleFission.Location = new System.Drawing.Point(6, 13);
this.btnTitleFission.Name = "btnTitleFission";
- this.btnTitleFission.Size = new System.Drawing.Size(82, 25);
+ this.btnTitleFission.Size = new System.Drawing.Size(96, 25);
this.btnTitleFission.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnTitleFission.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnTitleFission.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -293,7 +297,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnSetGroup.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSetGroup.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSetGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSetGroup.Location = new System.Drawing.Point(208, 13);
+ this.btnSetGroup.Location = new System.Drawing.Point(216, 13);
this.btnSetGroup.Name = "btnSetGroup";
this.btnSetGroup.Size = new System.Drawing.Size(84, 25);
this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -340,7 +344,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.cmbGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.cmbGroup.FormattingEnabled = true;
- this.cmbGroup.Location = new System.Drawing.Point(114, 13);
+ this.cmbGroup.Location = new System.Drawing.Point(122, 13);
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(92, 25);
this.cmbGroup.TabIndex = 640;
@@ -354,7 +358,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"安全商品",
"违规商品",
"未校验"});
- this.cmbSetWxSafe.Location = new System.Drawing.Point(114, 41);
+ this.cmbSetWxSafe.Location = new System.Drawing.Point(122, 41);
this.cmbSetWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSetWxSafe.Name = "cmbSetWxSafe";
this.cmbSetWxSafe.Size = new System.Drawing.Size(92, 25);
@@ -367,7 +371,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnSetWxSafe.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSetWxSafe.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSetWxSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSetWxSafe.Location = new System.Drawing.Point(208, 41);
+ this.btnSetWxSafe.Location = new System.Drawing.Point(216, 41);
this.btnSetWxSafe.Name = "btnSetWxSafe";
this.btnSetWxSafe.Size = new System.Drawing.Size(84, 25);
this.btnSetWxSafe.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -826,7 +830,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.tableLayoutPanel1.Controls.Add(this.dtpStart, 9, 2);
this.tableLayoutPanel1.Controls.Add(this.chkTime, 8, 2);
this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 2);
- this.tableLayoutPanel1.Controls.Add(this.chkNoUserProduct, 15, 2);
this.tableLayoutPanel1.Controls.Add(this.label16, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.txtSecretStyleCode, 5, 0);
@@ -862,7 +865,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
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.Controls.Add(this.panel1, 13, 2);
this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 3;
@@ -870,7 +873,7 @@ 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(900, 105);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 105);
this.tableLayoutPanel1.TabIndex = 679;
//
// cmbHasFission
@@ -881,17 +884,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"是",
"否"});
- this.cmbHasFission.Location = new System.Drawing.Point(794, 42);
+ this.cmbHasFission.Location = new System.Drawing.Point(801, 42);
this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbHasFission.Name = "cmbHasFission";
- this.cmbHasFission.Size = new System.Drawing.Size(48, 25);
+ this.cmbHasFission.Size = new System.Drawing.Size(49, 25);
this.cmbHasFission.TabIndex = 981;
//
// label20
//
this.label20.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(738, 44);
+ this.label20.Location = new System.Drawing.Point(745, 44);
this.label20.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(56, 17);
@@ -901,16 +904,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// 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(684, 41);
+ this.txtViewUvMin.Location = new System.Drawing.Point(690, 41);
this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtViewUvMin.Name = "txtViewUvMin";
- this.txtViewUvMin.Size = new System.Drawing.Size(48, 23);
+ this.txtViewUvMin.Size = new System.Drawing.Size(49, 23);
this.txtViewUvMin.TabIndex = 980;
//
// chkViewUvMin
//
this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.chkViewUvMin.Location = new System.Drawing.Point(625, 42);
+ this.chkViewUvMin.Location = new System.Drawing.Point(631, 42);
this.chkViewUvMin.Name = "chkViewUvMin";
this.chkViewUvMin.Size = new System.Drawing.Size(56, 21);
this.chkViewUvMin.TabIndex = 978;
@@ -925,17 +928,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"是",
"否"});
- this.cmbPddRelation.Location = new System.Drawing.Point(684, 7);
+ this.cmbPddRelation.Location = new System.Drawing.Point(690, 7);
this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbPddRelation.Name = "cmbPddRelation";
- this.cmbPddRelation.Size = new System.Drawing.Size(48, 25);
+ this.cmbPddRelation.Size = new System.Drawing.Size(49, 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(628, 9);
+ this.label19.Location = new System.Drawing.Point(634, 9);
this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(56, 17);
@@ -948,10 +951,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(571, 76);
+ this.dtpEnd.Location = new System.Drawing.Point(576, 76);
this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpEnd.Name = "dtpEnd";
- this.dtpEnd.Size = new System.Drawing.Size(110, 23);
+ this.dtpEnd.Size = new System.Drawing.Size(111, 23);
this.dtpEnd.TabIndex = 979;
//
// dtpStart
@@ -960,16 +963,16 @@ 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(461, 76);
+ this.dtpStart.Location = new System.Drawing.Point(465, 76);
this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.dtpStart.Name = "dtpStart";
- this.dtpStart.Size = new System.Drawing.Size(107, 23);
+ this.dtpStart.Size = new System.Drawing.Size(108, 23);
this.dtpStart.TabIndex = 978;
//
// chkTime
//
this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.chkTime.Location = new System.Drawing.Point(393, 77);
+ this.chkTime.Location = new System.Drawing.Point(397, 77);
this.chkTime.Name = "chkTime";
this.chkTime.Size = new System.Drawing.Size(65, 21);
this.chkTime.TabIndex = 977;
@@ -980,28 +983,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
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(246, 77);
+ this.cmbCat2.Location = new System.Drawing.Point(248, 77);
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat2.Name = "cmbCat2";
- this.cmbCat2.Size = new System.Drawing.Size(48, 25);
+ this.cmbCat2.Size = new System.Drawing.Size(49, 25);
this.cmbCat2.TabIndex = 804;
this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged);
//
- // chkNoUserProduct
- //
- this.chkNoUserProduct.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.chkNoUserProduct.AutoSize = true;
- this.chkNoUserProduct.Checked = true;
- this.chkNoUserProduct.CheckState = System.Windows.Forms.CheckState.Checked;
- this.tableLayoutPanel1.SetColumnSpan(this.chkNoUserProduct, 2);
- this.chkNoUserProduct.Location = new System.Drawing.Point(800, 77);
- this.chkNoUserProduct.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
- this.chkNoUserProduct.Name = "chkNoUserProduct";
- this.chkNoUserProduct.Size = new System.Drawing.Size(97, 21);
- this.chkNoUserProduct.TabIndex = 809;
- this.chkNoUserProduct.Text = "不显示客户商品";
- this.chkNoUserProduct.UseVisualStyleBackColor = true;
- //
// label16
//
this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right;
@@ -1027,17 +1015,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// 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(246, 6);
+ this.txtSecretStyleCode.Location = new System.Drawing.Point(248, 6);
this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtSecretStyleCode.Name = "txtSecretStyleCode";
- this.txtSecretStyleCode.Size = new System.Drawing.Size(48, 23);
+ this.txtSecretStyleCode.Size = new System.Drawing.Size(49, 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(207, 79);
+ this.label14.Location = new System.Drawing.Point(209, 79);
this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(39, 17);
@@ -1048,7 +1036,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(214, 9);
+ this.label15.Location = new System.Drawing.Point(216, 9);
this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(32, 17);
@@ -1059,7 +1047,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(515, 44);
+ this.label13.Location = new System.Drawing.Point(520, 44);
this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(56, 17);
@@ -1081,10 +1069,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"机会商品",
"以图搜品",
"多多外部数据"});
- this.cmbSourceType.Location = new System.Drawing.Point(246, 42);
+ this.cmbSourceType.Location = new System.Drawing.Point(248, 42);
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSourceType.Name = "cmbSourceType";
- this.cmbSourceType.Size = new System.Drawing.Size(48, 25);
+ this.cmbSourceType.Size = new System.Drawing.Size(49, 25);
this.cmbSourceType.TabIndex = 654;
this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
//
@@ -1092,7 +1080,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(214, 44);
+ this.label10.Location = new System.Drawing.Point(216, 44);
this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17);
@@ -1116,7 +1104,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.txtSPU.Location = new System.Drawing.Point(60, 6);
this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(48, 23);
+ this.txtSPU.Size = new System.Drawing.Size(49, 23);
this.txtSPU.TabIndex = 434;
//
// cmbWxCat
@@ -1127,10 +1115,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"是",
"否"});
- this.cmbWxCat.Location = new System.Drawing.Point(571, 7);
+ this.cmbWxCat.Location = new System.Drawing.Point(576, 7);
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxCat.Name = "cmbWxCat";
- this.cmbWxCat.Size = new System.Drawing.Size(48, 25);
+ this.cmbWxCat.Size = new System.Drawing.Size(49, 25);
this.cmbWxCat.TabIndex = 802;
//
// txtSKC
@@ -1139,7 +1127,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.txtSKC.Location = new System.Drawing.Point(60, 41);
this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtSKC.Name = "txtSKC";
- this.txtSKC.Size = new System.Drawing.Size(48, 23);
+ this.txtSKC.Size = new System.Drawing.Size(49, 23);
this.txtSKC.TabIndex = 432;
//
// cmbSort
@@ -1149,10 +1137,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.cmbSort.Items.AddRange(new object[] {
"入库时间",
"曝光量"});
- this.cmbSort.Location = new System.Drawing.Point(339, 42);
+ this.cmbSort.Location = new System.Drawing.Point(342, 42);
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSort.Name = "cmbSort";
- this.cmbSort.Size = new System.Drawing.Size(48, 25);
+ this.cmbSort.Size = new System.Drawing.Size(49, 25);
this.cmbSort.TabIndex = 448;
this.cmbSort.Text = "入库时间";
//
@@ -1160,7 +1148,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(307, 44);
+ this.label6.Location = new System.Drawing.Point(310, 44);
this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(32, 17);
@@ -1171,7 +1159,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(307, 9);
+ this.label4.Location = new System.Drawing.Point(310, 9);
this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(32, 17);
@@ -1182,7 +1170,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(515, 9);
+ this.label12.Location = new System.Drawing.Point(520, 9);
this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(56, 17);
@@ -1192,17 +1180,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(339, 6);
+ this.txtExtCode.Location = new System.Drawing.Point(342, 6);
this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtExtCode.Name = "txtExtCode";
- this.txtExtCode.Size = new System.Drawing.Size(48, 23);
+ this.txtExtCode.Size = new System.Drawing.Size(49, 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(121, 44);
+ this.lblGroup.Location = new System.Drawing.Point(122, 44);
this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.lblGroup.Name = "lblGroup";
this.lblGroup.Size = new System.Drawing.Size(32, 17);
@@ -1213,10 +1201,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(153, 42);
+ this.cmbGroupFilter.Location = new System.Drawing.Point(154, 42);
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbGroupFilter.Name = "cmbGroupFilter";
- this.cmbGroupFilter.Size = new System.Drawing.Size(48, 25);
+ this.cmbGroupFilter.Size = new System.Drawing.Size(49, 25);
this.cmbGroupFilter.TabIndex = 653;
//
// cmbExportToOutServer
@@ -1228,17 +1216,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"是",
"否",
"导出未拉回"});
- this.cmbExportToOutServer.Location = new System.Drawing.Point(571, 42);
+ this.cmbExportToOutServer.Location = new System.Drawing.Point(576, 42);
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
- this.cmbExportToOutServer.Size = new System.Drawing.Size(48, 25);
+ this.cmbExportToOutServer.Size = new System.Drawing.Size(49, 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(393, 9);
+ this.label3.Location = new System.Drawing.Point(397, 9);
this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17);
@@ -1248,10 +1236,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(461, 6);
+ this.txtProdName.Location = new System.Drawing.Point(465, 6);
this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtProdName.Name = "txtProdName";
- this.txtProdName.Size = new System.Drawing.Size(48, 23);
+ this.txtProdName.Size = new System.Drawing.Size(49, 23);
this.txtProdName.TabIndex = 427;
//
// cmbWxSafe
@@ -1264,10 +1252,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"安全商品",
"违规商品",
"未校验"});
- this.cmbWxSafe.Location = new System.Drawing.Point(461, 42);
+ this.cmbWxSafe.Location = new System.Drawing.Point(465, 42);
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbWxSafe.Name = "cmbWxSafe";
- this.cmbWxSafe.Size = new System.Drawing.Size(48, 25);
+ this.cmbWxSafe.Size = new System.Drawing.Size(49, 25);
this.cmbWxSafe.TabIndex = 676;
this.cmbWxSafe.Text = "安全+未校验";
//
@@ -1275,7 +1263,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblWxSafe.AutoSize = true;
- this.lblWxSafe.Location = new System.Drawing.Point(393, 44);
+ this.lblWxSafe.Location = new System.Drawing.Point(397, 44);
this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.lblWxSafe.Name = "lblWxSafe";
this.lblWxSafe.Size = new System.Drawing.Size(56, 17);
@@ -1286,7 +1274,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.lblNotes.AutoSize = true;
- this.lblNotes.Location = new System.Drawing.Point(121, 9);
+ this.lblNotes.Location = new System.Drawing.Point(122, 9);
this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.lblNotes.Name = "lblNotes";
this.lblNotes.Size = new System.Drawing.Size(32, 17);
@@ -1296,20 +1284,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(153, 6);
+ this.txtNotes.Location = new System.Drawing.Point(154, 6);
this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtNotes.Name = "txtNotes";
- this.txtNotes.Size = new System.Drawing.Size(48, 23);
+ this.txtNotes.Size = new System.Drawing.Size(49, 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(153, 77);
+ this.cmbCat1.Location = new System.Drawing.Point(154, 77);
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat1.Name = "cmbCat1";
- this.cmbCat1.Size = new System.Drawing.Size(48, 25);
+ this.cmbCat1.Size = new System.Drawing.Size(49, 25);
this.cmbCat1.TabIndex = 805;
this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged);
//
@@ -1317,7 +1305,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(114, 79);
+ this.label2.Location = new System.Drawing.Point(115, 79);
this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(39, 17);
@@ -1328,10 +1316,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(339, 77);
+ this.cmbCat3.Location = new System.Drawing.Point(342, 77);
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbCat3.Name = "cmbCat3";
- this.cmbCat3.Size = new System.Drawing.Size(48, 25);
+ this.cmbCat3.Size = new System.Drawing.Size(49, 25);
this.cmbCat3.TabIndex = 811;
this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged);
//
@@ -1339,7 +1327,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(300, 79);
+ this.label17.Location = new System.Drawing.Point(303, 79);
this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(39, 17);
@@ -1352,7 +1340,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.txtRealCoid.Location = new System.Drawing.Point(60, 76);
this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.txtRealCoid.Name = "txtRealCoid";
- this.txtRealCoid.Size = new System.Drawing.Size(48, 23);
+ this.txtRealCoid.Size = new System.Drawing.Size(49, 23);
this.txtRealCoid.TabIndex = 814;
//
// btnEmpty
@@ -1361,7 +1349,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(848, 40);
+ this.btnEmpty.Location = new System.Drawing.Point(856, 40);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(46, 25);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1387,7 +1375,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(848, 5);
+ this.btnSearch.Location = new System.Drawing.Point(856, 5);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(46, 25);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1409,7 +1397,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(738, 9);
+ this.label11.Location = new System.Drawing.Point(745, 9);
this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(56, 17);
@@ -1424,17 +1412,29 @@ namespace TemuKJD.PDDForms.ProductSelectForms
"",
"普通商品",
"爆款数据"});
- this.cmbSpProdType.Location = new System.Drawing.Point(794, 7);
+ this.cmbSpProdType.Location = new System.Drawing.Point(801, 7);
this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
this.cmbSpProdType.Name = "cmbSpProdType";
- this.cmbSpProdType.Size = new System.Drawing.Size(48, 25);
+ this.cmbSpProdType.Size = new System.Drawing.Size(49, 25);
this.cmbSpProdType.TabIndex = 677;
//
+ // panel1
+ //
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel1.SetColumnSpan(this.panel1, 4);
+ this.panel1.Controls.Add(this.chkWXComplateProd);
+ this.panel1.Controls.Add(this.chkNoUserProduct);
+ this.panel1.Location = new System.Drawing.Point(693, 73);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(212, 29);
+ this.panel1.TabIndex = 982;
+ //
// chkWXComplateProd
//
this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.tableLayoutPanel1.SetColumnSpan(this.chkWXComplateProd, 2);
- this.chkWXComplateProd.Location = new System.Drawing.Point(690, 77);
+ this.chkWXComplateProd.Location = new System.Drawing.Point(1, 4);
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);
@@ -1442,6 +1442,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.chkWXComplateProd.Text = "微信回采商品";
this.chkWXComplateProd.UseVisualStyleBackColor = true;
//
+ // chkNoUserProduct
+ //
+ this.chkNoUserProduct.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.chkNoUserProduct.AutoSize = true;
+ this.chkNoUserProduct.Checked = true;
+ this.chkNoUserProduct.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.chkNoUserProduct.Location = new System.Drawing.Point(98, 4);
+ this.chkNoUserProduct.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+ this.chkNoUserProduct.Name = "chkNoUserProduct";
+ this.chkNoUserProduct.Size = new System.Drawing.Size(111, 21);
+ this.chkNoUserProduct.TabIndex = 809;
+ this.chkNoUserProduct.Text = "不显示客户商品";
+ this.chkNoUserProduct.UseVisualStyleBackColor = true;
+ //
// chkPullAfterPush
//
this.chkPullAfterPush.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -2018,6 +2032,32 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.statusBar.Size = new System.Drawing.Size(1438, 25);
this.statusBar.TabIndex = 5;
//
+ // btnAddUserProd
+ //
+ this.btnAddUserProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnAddUserProd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnAddUserProd.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnAddUserProd.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnAddUserProd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnAddUserProd.Location = new System.Drawing.Point(6, 41);
+ this.btnAddUserProd.Name = "btnAddUserProd";
+ this.btnAddUserProd.Size = new System.Drawing.Size(96, 25);
+ this.btnAddUserProd.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnAddUserProd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnAddUserProd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnAddUserProd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnAddUserProd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnAddUserProd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnAddUserProd.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnAddUserProd.Style.GradientAngle = 90;
+ this.btnAddUserProd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnAddUserProd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnAddUserProd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnAddUserProd.TabIndex = 800;
+ this.btnAddUserProd.Text = "添加到用户商品";
+ this.btnAddUserProd.Visible = false;
+ this.btnAddUserProd.Click += new System.EventHandler(this.btnAddUserProd_Click);
+ //
// PDDDBProdListForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2049,6 +2089,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.flowLayoutPanel1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
@@ -2195,5 +2237,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.Label label8;
private UserComponent.UcCheckBox chkNoUserProduct;
+ private System.Windows.Forms.Panel panel1;
+ private DevComponents.DotNetBar.PanelEx btnAddUserProd;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
index 4f9d328..502cc4e 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
@@ -112,6 +112,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.dgvDbProduct.Columns["colAddTimes"].Visible = true;
}
+//#if DEBUG
+ if (BaseClass.MainPath == "29wx")
+ {
+ btnAddUserProd.Visible = true;
+ }
+//#endif
+
this.ucSplitPage1.PageChange += UcSplitPage1_PageChange;
this.dgvDbProduct.AddSelectorColumn("colSelect");
@@ -177,7 +184,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
}));
foreach (var prod in lstTemuDbProduct)
{
- string catName = prod.cat_name ?? prod.cat_id;
+ string catName = (prod.cat_name ?? prod.cat_id);
if (prod.wx_cat_leaf != null)
{
var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_leaf.ParseToString())?.name;
@@ -210,6 +217,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
catName = catN + " >> " + catName;
}
}
+ if (prod.wx_cat_1 == null || prod.wx_cat_2 == null || prod.wx_cat_3 == null || prod.wx_cat_leaf == null)
+ catName += "(未识别)";
Invoke(new Action(() =>
{
int rowIndex = this.dgvDbProduct.Rows.Add(
@@ -1381,6 +1390,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
mainImgLst3 = wxClientProdInfo.info.head_img.Take(3).ToList();
productTitle = wxClientProdInfo.info.title;
}
+ if (dbProd.product_get_type_text == "微信店采")
+ {
+ string convertRst = "";
+ var pInfo = new PDDProdFormConverter().WXProdToPddConvert(out convertRst, dbProd);
+ mainImgLst3 = pInfo.detail.galleries.Where(g => g.type == 1).Select(g => g.url).ToList();
+ productTitle = pInfo.detail.goods_name;
+ }
if (dbProd.product_get_type_text == "1688外部数据")
{
string convertRst = "";
@@ -2396,5 +2412,226 @@ namespace TemuKJD.PDDForms.ProductSelectForms
{
Get1688ProductForm.Out1688ProductImport(false, this.statusBar, this.pbLoading);
}
+
+ private void btnAddUserProd_Click(object sender, EventArgs e)
+ {
+ var lstProdId = dgvDbProduct.Rows.Cast().Where(row
+ => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString().Split(' ').FirstOrDefault()).ToList();
+ var prodList = this.lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToList();
+ if (prodList.Count == 0)
+ {
+ BaseMsgForm.ShowInfo("请选择要添加到用户商品库的商品");
+ return;
+ }
+
+ WXForms.AdminForms.WXAdminAccountSelectForm wxAdminAccountSelectForm = new WXForms.AdminForms.WXAdminAccountSelectForm();
+ wxAdminAccountSelectForm.chkChanceProdCollect.Checked = true;
+ wxAdminAccountSelectForm.chkChanceProdCollect.Enabled = false;
+ wxAdminAccountSelectForm.ShowDialog();
+
+ var user = wxAdminAccountSelectForm.selectUser;
+ if (user == null)
+ {
+ BaseMsgForm.ShowInfo("未选择用户");
+ return;
+ }
+
+ this.statusBar.pgbTaskProgress.Maximum = prodList.Count;
+ this.statusBar.UpdateProgressBar(0);
+ if (cancellationTokenSource == null || cancellationTokenSource.IsCancellationRequested)
+ {
+ cancellationTokenSource = new CancellationTokenSource();
+ }
+ this.pbLoading.Visible = true;
+ Task.Run(() =>
+ {
+ try
+ {
+ int fail = 0;
+ int success = 0;
+ int prodTotal = prodList.Count;
+ foreach (var prod in prodList)
+ {
+ Invoke(new Action(() =>
+ {
+ statusBar.pgbTaskProgress.Maximum = prodTotal;
+ statusBar.UpdateProgressBar(fail + success);
+ statusBar.lblTaskStatus.Text = "添加用户商品总数" + prodTotal + "，成功" + success + "，失败" + fail;
+ }));
+ var dbProd = PDDDBProdEditForm.GetPddProductDetail(prod.id.ParseToString());
+ var rst = AddUserProdFromPDDDB(user, dbProd);
+ if (!rst.Contains("成功"))
+ {
+ fail++;
+ continue;
+ }
+ Thread.Sleep(100);
+ rst = AddUserProdFromPDDDB(user, dbProd);
+ if (!rst.Contains("成功"))
+ {
+ fail++;
+ continue;
+ }
+ success++;
+ }
+ Invoke(new Action(() =>
+ {
+ statusBar.pgbTaskProgress.Maximum = prodTotal;
+ statusBar.UpdateProgressBar(fail + success);
+ statusBar.lblTaskStatus.Text = "添加用户商品总数" + prodTotal + "，成功" + success + "，失败" + fail;
+ }));
+ }
+ catch (Exception ex)
+ {
+ BaseMsgForm.ShowError(ex.Message);
+ }
+ // 刷新结果
+ SearchDbProd(this.ucSplitPage1.CurrentPage);
+ Invoke(new Action(() =>
+ {
+ pbLoading.Visible = false;
+ statusBar.lblTaskStatus.Text += " 添加到用户商品库完成";
+ BaseMsgForm.ShowInfo("添加到用户商品库完成！");
+ }));
+ }, cancellationTokenSource.Token);
+ }
+
+ public string AddUserProdFromPDDDB(UserSubAccountInfo user, KJDDBProduct sourceProd)
+ {
+ if (user == null)
+ return "添加用户商品入库失败！用户不存在";
+ if (sourceProd == null)
+ return "添加用户商品入库失败！商品不存在";
+ string prodId = sourceProd.spu_id?.Split('-')?.FirstOrDefault();
+ if (prodId.IsNullOrEmpty())
+ return "添加用户商品入库失败！商品ID不存在";
+
+ var isCollectAuthorityUser = user.authority.Contains("商品采集");
+ if (!isCollectAuthorityUser)
+ return "添加用户商品入库失败！用户无商品采集权限";
+
+ // 商品采集权限用户采集的数据加上用户前缀（商品前缀显示给用户的时候隐藏）
+ string collectAuthorityTag = "";
+ if (isCollectAuthorityUser)
+ collectAuthorityTag = "-" + user.user_name;
+
+ bool isExist = false;
+ var existUrl = BaseClass.BuildPDDObjString("product/get_product_spu_id_list");
+ string existData = UserLogin.GetSignaturex() + "&search_spu_ids=" + prodId + collectAuthorityTag;
+ string html = GetHtml.PostUtf8(existUrl, existData);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ html = GetHtml.PostUtf8(existUrl, existData);
+ if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+ {
+ return "添加用户商品入库失败，产品数据库连接失败";
+ }
+ else
+ {
+ if (html.Contains("\"data\":[") && !html.Contains("\"data\":[]"))
+ isExist = true;
+ }
+
+ var url = BaseClass.BuildPDDObjString("product/add_product");
+ if (isExist)
+ url = BaseClass.BuildPDDObjString("product/mdy_product");
+
+
+ var data = Work.UserLogin.GetSignaturex();
+ data += "&spu_id=" + prodId + collectAuthorityTag;
+ data += "&skc_id=" + sourceProd.skc_id;
+ data += "&from_shop_id=" + sourceProd.from_shop_id;
+ data += "&from_shop_name=" + sourceProd.from_shop_name;
+ if (!string.IsNullOrWhiteSpace(sourceProd.real_coid))
+ data += "&real_coid=" + sourceProd.real_coid;
+ data += "&price_text=" + sourceProd.price_text;
+ data += "&ext_code=" + sourceProd.ext_code;
+ data += "&product_name=" + HttpUtility.UrlEncode(sourceProd.product_name, Encoding.UTF8) +
+ "&product_json=" + HttpUtility.UrlEncode(sourceProd.product_json, Encoding.UTF8) +
+ "&size_json=" + HttpUtility.UrlEncode(sourceProd.size_json, Encoding.UTF8) +
+ "&sale_count=" + sourceProd.sale_count +
+ "&sale_count_text=" + sourceProd.sale_count_text +
+ "&main_img=" + HttpUtility.UrlEncode(sourceProd.main_img, Encoding.UTF8) +
+ "&wx_safe_status=" + HttpUtility.UrlEncode(sourceProd.wx_safe_status, Encoding.UTF8) +
+ "&product_get_type=" + HttpUtility.UrlEncode(sourceProd.product_get_type_text, Encoding.UTF8);
+ if (isCollectAuthorityUser)
+ {
+ data += "&add_user_name=" + user.user_name;
+ data += "&group=用户" + user.user_name;
+ }
+ if (sourceProd.wx_cat_1 != null) data += "&wx_cat_1=" + sourceProd.wx_cat_1;
+ if (sourceProd.wx_cat_2 != null) data += "&wx_cat_2=" + sourceProd.wx_cat_2;
+ if (sourceProd.wx_cat_3 != null) data += "&wx_cat_3=" + sourceProd.wx_cat_3;
+ if (sourceProd.wx_cat_leaf != null) data += "&wx_cat_leaf=" + sourceProd.wx_cat_leaf;
+ data += "&main_cat_id=" + sourceProd.main_cat_id;
+ data += "&main_cat_name=" + sourceProd.main_cat_name;
+ data += "&cat_id=" + sourceProd.cat_id;
+ data += "&cat_name=" + HttpUtility.UrlEncode(sourceProd.cat_name.ParseToString(), Encoding.UTF8);
+ if (sourceProd.distribution_set != null)
+ data += "&distribution_set=" + sourceProd.distribution_set;
+
+ // 转移给别的用户就变成普通商品
+ //var specialProdType = sourceProd.special_prod_type == "爆款数据" ? "爆款数据" : "普通商品";
+ //if (specialProdType == "爆款数据")
+ // data += "&add_hot_version=v3";
+ //data += "&special_prod_type=" + HttpUtility.UrlEncode(specialProdType, Encoding.UTF8);
+ data += "&special_prod_type=" + HttpUtility.UrlEncode("普通商品", Encoding.UTF8);
+
+ if (sourceProd.view_uv != null)
+ {
+ data += "&view_uv=" + sourceProd.view_uv;
+ }
+
+ // 其他一些商品数据复制
+ {
+ data += "&fission_words=" + sourceProd.fission_words;
+ data += "&head_words=" + sourceProd.head_words;
+ data += "&end_words=" + sourceProd.end_words;
+ data += "&ext_code_price=" + sourceProd.ext_code_price;
+ data += "¬es=" + sourceProd.notes;
+ data += "&offline_supplier_id=" + sourceProd.offline_supplier_id;
+ data += "&offline_supplier_name=" + sourceProd.offline_supplier_name;
+ data += "&problem_prod_data=" + sourceProd.problem_prod_data;
+ data += "&send_to_out_server=" + sourceProd.send_to_out_server;
+
+ data += "&sku_edit_json=" + sourceProd.sku_edit_json;
+ data += "&wx_img_map_json=" + sourceProd.wx_img_map_json;
+
+ if (!string.IsNullOrEmpty(sourceProd.real_spu_id))
+ data += "&real_spu_id=" + sourceProd.real_spu_id;
+ data += "&secret_spu_id=" + sourceProd.secret_spu_id;
+ data += "&sku_secret_json=" + sourceProd.sku_secret_json;
+ }
+
+ 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"))
+ {
+ string msg = "商品入库失败！请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
+ return msg;
+ }
+ else
+ {
+ //prod.getProductMsg = "商品入库成功!";
+ //Invoke(new Action(() =>
+ //{
+ // row.Cells["colMsg"].Value = prod.getProductMsg;
+ //}));
+ if (!isExist)
+ {
+ url = BaseClass.BuildPDDObjString("product/mdy_product");
+ 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"))
+ {
+ string msg = "商品入库失败！请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
+ return msg;
+ }
+ }
+
+ return "微信商品采集入库成功！";
+ }
+ }
}
}
diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
index 9106a2d..a6b389b 100644
--- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
+++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs
@@ -741,7 +741,7 @@ namespace TemuKJD.PDDForms.ShopForms
//if (result?.Contains("\"code\":200") == true)
//{
// var jObj = JObject.Parse(result);
- // List shopSubAccountList = JsonHelper.DeserializeJsonToList(jObj["data"].ToString());
+ // List shopSubAccountList = JsonHelper.DeserializeJsonToList(jObj["data"].ToString());
// foreach (var shop in GlobalConfig.DouShopLoginList)
// {
// shop.ShopSubAccountList.Clear();
@@ -758,7 +758,7 @@ namespace TemuKJD.PDDForms.ShopForms
shop.ShopSubAccountList.Clear();
if (!string.IsNullOrWhiteSpace(shop.SubUserName))
{
- ShopSubAccountInfo subAccount = new ShopSubAccountInfo();
+ UserSubAccountInfo subAccount = new UserSubAccountInfo();
subAccount.sub_user_name = shop.SubUserName;
subAccount.user_name = shop.SubUserName;
subAccount.shop_login_name = shop.LoginName;
diff --git a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.cs
index 821f49b..c31a105 100644
--- a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.cs
+++ b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountListForm.cs
@@ -16,7 +16,7 @@ namespace TemuKJD.PDDForms.ShopForms
{
public partial class PDDSubAccountListForm : BaseForm
{
- public static List AllUsers { get; set; } = new List();
+ public static List AllUsers { get; set; } = new List();
public MainForm Mf { get; set; } = null;
public string Uid { get; set; } = "";
public PDDSubAccountListForm()
@@ -120,7 +120,7 @@ namespace TemuKJD.PDDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
diff --git a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountShopEditForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountShopEditForm.cs
index 56614f6..3f8a218 100644
--- a/TEMUKJD/PDDForms/ShopForms/PDDSubAccountShopEditForm.cs
+++ b/TEMUKJD/PDDForms/ShopForms/PDDSubAccountShopEditForm.cs
@@ -17,9 +17,9 @@ namespace TemuKJD.PDDForms.ShopForms
public partial class PDDSubAccountShopEditForm : BaseGeneralForm
{
ShopLoginInfo shop = null;
- public List AllSubAccountList { get; set; } = new List();
- public List ShopSubAccountList { get; set; } = new List();
- public List NotShopSubAccountList { get; set; } = new List();
+ public List AllSubAccountList { get; set; } = new List();
+ public List ShopSubAccountList { get; set; } = new List();
+ public List NotShopSubAccountList { get; set; } = new List();
public PDDSubAccountShopEditForm(ShopLoginInfo _shop)
{
InitializeComponent();
@@ -51,7 +51,7 @@ namespace TemuKJD.PDDForms.ShopForms
foreach (Newtonsoft.Json.Linq.JObject obj in userObj["data"])
{
string oStr = JsonHelper.SerializeObject(obj);
- ShopSubAccountInfo user = new ShopSubAccountInfo();
+ UserSubAccountInfo user = new UserSubAccountInfo();
user.id = BaseRegex.GetIntJson(ref oStr, "id");
user.nick_name = BaseRegex.GetStringJson(ref oStr, "nick_name");
user.user_name = BaseRegex.GetStringJson(ref oStr, "user_name");
@@ -134,8 +134,8 @@ namespace TemuKJD.PDDForms.ShopForms
private void btnOk_Click(object sender, EventArgs e)
{
- List AddUsers = new List();
- List DeleteUsers = new List();
+ List AddUsers = new List();
+ List DeleteUsers = new List();
foreach (Control c in this.flpNotSubAccount.Controls)
{
var co = c as UcSubAccount;
diff --git a/TEMUKJD/PDDForms/ShopForms/UcSubAccount.cs b/TEMUKJD/PDDForms/ShopForms/UcSubAccount.cs
index 492cdd3..1a7089e 100644
--- a/TEMUKJD/PDDForms/ShopForms/UcSubAccount.cs
+++ b/TEMUKJD/PDDForms/ShopForms/UcSubAccount.cs
@@ -13,14 +13,14 @@ namespace TemuKJD.PDDForms.ShopForms
{
public partial class UcSubAccount : UserControl
{
- public ShopSubAccountInfo subAccount = null;
+ public UserSubAccountInfo subAccount = null;
public delegate void SubAcountDelegate(object obj);
public event SubAcountDelegate AddSubAcountEvent;
public event SubAcountDelegate RemoveSubAcountEvent;
- public UcSubAccount(ShopSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
+ public UcSubAccount(UserSubAccountInfo _subAccount, bool isNotShopSubAccount = true)
{
InitializeComponent();
subAccount = _subAccount;
diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.cs b/TEMUKJD/ToolForms/Get1688ProductForm.cs
index 106bbca..0051c46 100644
--- a/TEMUKJD/ToolForms/Get1688ProductForm.cs
+++ b/TEMUKJD/ToolForms/Get1688ProductForm.cs
@@ -1137,7 +1137,7 @@ namespace TemuKJD.ToolForms
{
}
- public static void Out1688ProductImport(bool isCollectAuthorityUser, StatusBarUserControl statusBar, PictureBox pbLoading)
+ public static void Out1688ProductImport(bool isCollectAuthorityUser, StatusBarUserControl statusBar, PictureBox pbLoading, Action