diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index 4bc5f53..00c198c 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -60,4 +60,10 @@ + + + Never + + + \ No newline at end of file diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index ad25754..0589328 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1312; + public static int VersionCount = 1320; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; diff --git a/Bin.Pak/package260708川合供应链 x64.nsi b/Bin.Pak/package260915川合供应链 x64.nsi similarity index 99% rename from Bin.Pak/package260708川合供应链 x64.nsi rename to Bin.Pak/package260915川合供应链 x64.nsi index 0babadd..18608f7 100644 --- a/Bin.Pak/package260708川合供应链 x64.nsi +++ b/Bin.Pak/package260915川合供应链 x64.nsi @@ -2,7 +2,7 @@ ; װʼ峣 !define PRODUCT_NAME "ϹӦ" -!define PRODUCT_VERSION "v12.15" +!define PRODUCT_VERSION "v12.61" ;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29Ӧ.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index ce1db89..fd6e57a 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -26,6 +26,7 @@ using System.Windows.Forms; using TemuKJD.BaseForms; using TemuKJD.BLL; using TemuKJD.Extension; +using TemuKJD.KJDForms.ProductForms.TemuJitSubForms; using TemuKJD.ToolForms; using TemuKJD.WXForms.ProductForms; using Work; @@ -1586,9 +1587,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - public static void GetProdWxCat(KJDDBProduct prod, DataGridViewRow row) + public static void GetProdWxCat(KJDDBProduct prod, DataGridViewRow row, ShopLoginInfo _shop = null) { - var shop = GlobalConfig.ShopLoginList.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); + ShopLoginInfo shop = null; + if (_shop != null) + shop = _shop; + else + shop = GlobalConfig.ShopLoginList.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); WXShopTokenInfo token = WXDBProdUploadForm.lstWXShopTokenInfo.FirstOrDefault(t => t.shopId == shop.ShopId); for (int i = 0; i < 5; i++) { @@ -1610,10 +1615,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } // 如果店铺token不可用，随机获取一个上传图片的accessToken - if (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken)) + if (_shop == null && (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken))) { // 获取微信accessToken - //token = new WxApiBLL().GetRandomWxToken(); + token = new WxApiBLL().GetRandomWxToken(); shop = GlobalConfig.ShopLoginList.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); token = WXDBProdUploadForm.lstWXShopTokenInfo.FirstOrDefault(t => t.shopId == shop.ShopId); @@ -1631,13 +1636,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms obj["req_type"] = 1; obj["head_imgs"] = new JArray(); - var dbProd = PDDDBProdEditForm.GetPddProductDetail(prod.id.ParseToString()); + KJDDBProduct dbProd = null; + if (prod.db_type == "云端数据") + dbProd = prod; + else + dbProd = PDDDBProdEditForm.GetPddProductDetail(prod.id.ParseToString()); List mainImgLst3 = new List(); string productTitle = ""; if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "1688厂家" || dbProd.product_get_type_text == "1688外部数据" || dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" || - dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据") + dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据" || dbProd.db_type == "云端数据") { if ((dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采") && dbProd.wx_cat_leaf != null) { @@ -1717,7 +1726,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms mainImgLst3 = pInfo.detail.galleries.Where(g => g.type == 1).Take(3).Select(s => s.url).ToList(); productTitle = pInfo.detail.goods_name; } - if (dbProd.product_get_type_text == "机会商品" || dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据") + if (dbProd.product_get_type_text == "机会商品" || dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据" || + dbProd.db_type == "云端数据") { string convertRst = ""; var pInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json); @@ -1757,6 +1767,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); + + throw new Exception("商品图片链接失效"); } } // 上传图片识别 @@ -1804,6 +1816,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms data1 += "&post_data=" + GetHtml.UrlEncodeUtf8(post_data); var html1 = GetHtml.PostUtf8(url1, data1); var catId = BaseRegex.GetStringJson(ref html1, "cat_id"); + if (string.IsNullOrEmpty(catId)) + { + throw new Exception(BaseRegex.GetStringJsonByRegs(ref html1, html1, "errMsg", "err_msg", "errorMsg", "error_msg")); + } var jCatFirstLst = JsonHelper.JObjectParse(html1)["categories"].FirstOrDefault()["cats"] as JArray; int index = 0; @@ -1934,6 +1950,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms } catch (Exception ex) { + if (row == null) + throw new Exception(ex.Message); } } diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 701099d..b41a94a 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -2771,99 +2771,120 @@ namespace TemuKJD.WXForms.ProductForms } else { - //------------------------------------------------------------------------------------------------------------------------------------- - // ai识别类目暂存主图位置 - int imgId = 0; - string tempImgPath = Path.GetTempPath().Trim('\\') + "\\" + Randomx.GetWordWithNumber(8).ToLower(); - List tempImgFullPathLst = new List(); - //------------------------------------------------------------------------------------------------------------------------------------- - // 生成ai识别类目所需图片 - var aiGalleries = prodInfo.detail.galleries.Where(g => g.type == 1).Take(3).ToList(); - foreach (var gallery_item in aiGalleries) // 9张主图 - { - imgId++; - string getImgError; - var imgUrl = gallery_item.url; - { - if (!imgUrl.Contains("wxapp") && imgUrl.Contains("mmecimage.cn")) - imgUrl = imgUrl.Replace("https://", "http://"); - } - var image = GetHtml.GetUrlImg(imgUrl, out getImgError); - var imageBg = new Bitmap(800, 800); - if (!string.IsNullOrEmpty(getImgError) || image == null) - { - return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"初始化主图上传失败\"}"; - } - using (Graphics g = Graphics.FromImage(imageBg)) - { - g.DrawImage(image, new Rectangle(0, 0, imageBg.Width, imageBg.Height), 0, 0, image.Width, image.Height, GraphicsUnit.Pixel); - } - - // 取前三张图片保存到系统temp路径，配合商品标题获取商品类目 - if (imgId <= 3) - { - if (!Directory.Exists(tempImgPath)) - Directory.CreateDirectory(tempImgPath); - string imgFullPath = tempImgPath + "\\图片" + imgId + ".jpg"; - tempImgFullPathLst.Add(imgFullPath); - if (imgId == 1) - { - try - { - image.Save(imgFullPath, System.Drawing.Imaging.ImageFormat.Jpeg); - } - catch - { - // 真实图像失败传假图也能识别 - int fileSize = Randomx.GetId(1024, 10240); - using (BinaryWriter writer = new BinaryWriter(File.Create(imgFullPath))) - { - for (int i = 0; i < fileSize; i++) - { - writer.Write((byte)Randomx.GetId(256)); // 生成0到255之间的随机字节 - } - } - } - } - else - { - // 只需要传一张真实图像即可 - int fileSize = Randomx.GetId(1024, 10240); - using (BinaryWriter writer = new BinaryWriter(File.Create(imgFullPath))) - { - for (int i = 0; i < fileSize; i++) - { - writer.Write((byte)Randomx.GetId(256)); // 生成0到255之间的随机字节 - } - } - } - } - } - Thread.Sleep(Randomx.GetId(100, 300)); - //------------------------------------------------------------------------------------------------------------------------------------- - // 根据Ai分类，获取类目信息 - //{"code":0,"predInfo":{"firstCatRes":[{"catId":10000111,"catName":"服饰内衣","level":1},{"catId":10000111,"catName":"服饰内衣","level":1},{"catId":10000111,"catName":"服饰内衣","level":1}],"secondCatRes":[{"catId":10000113,"catName":"女装","level":2},{"catId":10000113,"catName":"女装","level":2},{"catId":10000113,"catName":"女装","level":2}],"thirdCatRes":[{"catId":547705,"catName":"牛仔裤","level":3,"modelVersion":""},{"catId":547704,"catName":"加绒裤","level":3,"modelVersion":"商品标题含'加绒加厚、保暖'等关键词，这表示裤子具备加绒保暖功能。主图展示了加绒内衬，也符合【服饰内衣:女装:裤子:加绒裤】类目特征。"},{"catId":547701,"catName":"休闲裤","level":3,"modelVersion":""}],"singleSecondCatRes":[],"singleFirstCatRes":[],"isSupportedCate":1},"aiCategoryList":[{"id":547705,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547705","name":"牛仔裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]},{"id":547704,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547704","name":"加绒裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]},{"id":547701,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547701","name":"休闲裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]}],"version":"ProductClsRAG","noQualificationCatIds":[547705,547704,547701],"depositCatInfos":[{"catId":547705,"amountToPay":0,"error":false},{"catId":547704,"amountToPay":0,"error":false},{"catId":547701,"amountToPay":0,"error":false}],"visionCallMethod":"ProductClsRAG"} - var productClassifyRst = WXUpload.getProductClassify(shop, upProdInitParam.product.info.title, tempImgFullPathLst); - if (!productClassifyRst.Contains("\"code\":0")) - { - var error = BaseRegex.GetStringJson(ref productClassifyRst, "msg"); - if (string.IsNullOrEmpty(error)) - error = productClassifyRst; - return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目失败 " + error + "\"}"; - } - WXGetProdCateInfo cateInfo = new WXGetProdCateInfo(); try { - cateInfo = JsonHelper.DeserializeJsonToObject(productClassifyRst); - foreach (var catePath in cateInfo.aiCategoryList.FirstOrDefault().paths) - { - aiCateIdLst.Add(catePath.id.ParseToLong()); - } + PDDDBProdListForm.GetProdWxCat(dbProd, null, shop); + + if (!dbProd.wx_cat_1.IsNullOrZero()) + aiCateIdLst.Add(dbProd.wx_cat_1.ParseToLong()); + if (!dbProd.wx_cat_2.IsNullOrZero()) + aiCateIdLst.Add(dbProd.wx_cat_2.ParseToLong()); + if (!dbProd.wx_cat_3.IsNullOrZero()) + aiCateIdLst.Add(dbProd.wx_cat_3.ParseToLong()); + if (!dbProd.wx_cat_leaf.IsNullOrZero()) + aiCateIdLst.Add(dbProd.wx_cat_leaf.ParseToLong()); + aiCateIdLst = aiCateIdLst.Distinct().ToList(); + if (aiCateIdLst.Count == 0 || aiCateIdLst.Count == 1) + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目失败 未识别到完整类目\"}"; } catch (Exception ex) { - return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"" + "根据图片获取类目失败 " + ex.Message + "\"}"; + return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目失败 " + ex.Message + "\"}"; } + + ////------------------------------------------------------------------------------------------------------------------------------------- + //// ai识别类目暂存主图位置 (模拟接口暂时废弃) + //int imgId = 0; + //string tempImgPath = Path.GetTempPath().Trim('\\') + "\\" + Randomx.GetWordWithNumber(8).ToLower(); + //List tempImgFullPathLst = new List(); + ////------------------------------------------------------------------------------------------------------------------------------------- + //// 生成ai识别类目所需图片 + //var aiGalleries = prodInfo.detail.galleries.Where(g => g.type == 1).Take(3).ToList(); + //foreach (var gallery_item in aiGalleries) // 9张主图 + //{ + // imgId++; + // string getImgError; + // var imgUrl = gallery_item.url; + // { + // if (!imgUrl.Contains("wxapp") && imgUrl.Contains("mmecimage.cn")) + // imgUrl = imgUrl.Replace("https://", "http://"); + // } + // var image = GetHtml.GetUrlImg(imgUrl, out getImgError); + // var imageBg = new Bitmap(800, 800); + // if (!string.IsNullOrEmpty(getImgError) || image == null) + // { + // return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"初始化主图上传失败\"}"; + // } + // using (Graphics g = Graphics.FromImage(imageBg)) + // { + // g.DrawImage(image, new Rectangle(0, 0, imageBg.Width, imageBg.Height), 0, 0, image.Width, image.Height, GraphicsUnit.Pixel); + // } + + // // 取前三张图片保存到系统temp路径，配合商品标题获取商品类目 + // if (imgId <= 3) + // { + // if (!Directory.Exists(tempImgPath)) + // Directory.CreateDirectory(tempImgPath); + // string imgFullPath = tempImgPath + "\\图片" + imgId + ".jpg"; + // tempImgFullPathLst.Add(imgFullPath); + // if (imgId == 1) + // { + // try + // { + // image.Save(imgFullPath, System.Drawing.Imaging.ImageFormat.Jpeg); + // } + // catch + // { + // // 真实图像失败传假图也能识别 + // int fileSize = Randomx.GetId(1024, 10240); + // using (BinaryWriter writer = new BinaryWriter(File.Create(imgFullPath))) + // { + // for (int i = 0; i < fileSize; i++) + // { + // writer.Write((byte)Randomx.GetId(256)); // 生成0到255之间的随机字节 + // } + // } + // } + // } + // else + // { + // // 只需要传一张真实图像即可 + // int fileSize = Randomx.GetId(1024, 10240); + // using (BinaryWriter writer = new BinaryWriter(File.Create(imgFullPath))) + // { + // for (int i = 0; i < fileSize; i++) + // { + // writer.Write((byte)Randomx.GetId(256)); // 生成0到255之间的随机字节 + // } + // } + // } + // } + //} + //Thread.Sleep(Randomx.GetId(100, 300)); + ////------------------------------------------------------------------------------------------------------------------------------------- + //// 根据Ai分类，获取类目信息 + ////{"code":0,"predInfo":{"firstCatRes":[{"catId":10000111,"catName":"服饰内衣","level":1},{"catId":10000111,"catName":"服饰内衣","level":1},{"catId":10000111,"catName":"服饰内衣","level":1}],"secondCatRes":[{"catId":10000113,"catName":"女装","level":2},{"catId":10000113,"catName":"女装","level":2},{"catId":10000113,"catName":"女装","level":2}],"thirdCatRes":[{"catId":547705,"catName":"牛仔裤","level":3,"modelVersion":""},{"catId":547704,"catName":"加绒裤","level":3,"modelVersion":"商品标题含'加绒加厚、保暖'等关键词，这表示裤子具备加绒保暖功能。主图展示了加绒内衬，也符合【服饰内衣:女装:裤子:加绒裤】类目特征。"},{"catId":547701,"catName":"休闲裤","level":3,"modelVersion":""}],"singleSecondCatRes":[],"singleFirstCatRes":[],"isSupportedCate":1},"aiCategoryList":[{"id":547705,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547705","name":"牛仔裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]},{"id":547704,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547704","name":"加绒裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]},{"id":547701,"paths":[{"id":"10000111","name":"服饰内衣","sonIdList":["10000397","10000115","10000112","10000113","10000114"],"fId":"0","level":1,"leaf":false},{"id":"10000113","name":"女装","sonIdList":["546810","546811","530041","547706","6090","6089","6088","6087","6083","6076","6073","6070","6065","6063","6058","10000672","10000671","10000670","10000669","10000668","10000667","10000666","10000665","10000664","10000663","10000662","10000661","10000660","10000659","10000658","10000657","10000656","10000655"],"fId":"10000111","level":2,"leaf":false},{"id":"10000672","name":"裤子","sonIdList":["547699","547700","547701","547702","547703","547704","547705"],"fId":"10000113","level":3,"leaf":false},{"id":"547701","name":"休闲裤","fId":"10000672","level":4,"leaf":true,"state":0,"hasTrialCategory":false,"isTrialCategory":false,"isLocalLife":false}],"depositAmount":0,"catAuth":true,"limitSubjectTypes":[]}],"version":"ProductClsRAG","noQualificationCatIds":[547705,547704,547701],"depositCatInfos":[{"catId":547705,"amountToPay":0,"error":false},{"catId":547704,"amountToPay":0,"error":false},{"catId":547701,"amountToPay":0,"error":false}],"visionCallMethod":"ProductClsRAG"} + //var productClassifyRst = WXUpload.getProductClassify(shop, upProdInitParam.product.info.title, tempImgFullPathLst); + //if (!productClassifyRst.Contains("\"code\":0")) + //{ + // var error = BaseRegex.GetStringJson(ref productClassifyRst, "msg"); + // if (string.IsNullOrEmpty(error)) + // error = productClassifyRst; + // return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目失败 " + error + "\"}"; + //} + //WXGetProdCateInfo cateInfo = new WXGetProdCateInfo(); + //try + //{ + // cateInfo = JsonHelper.DeserializeJsonToObject(productClassifyRst); + // foreach (var catePath in cateInfo.aiCategoryList.FirstOrDefault().paths) + // { + // aiCateIdLst.Add(catePath.id.ParseToLong()); + // } + //} + //catch (Exception ex) + //{ + // return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"" + "根据图片获取类目失败 " + ex.Message + "\"}"; + //} } #endregion @@ -2885,9 +2906,20 @@ namespace TemuKJD.WXForms.ProductForms string getCateRst = WXUpload.getCategoryOnShelf(shop, aiCateIdLst); if (!getCateRst.Contains("\"code\":0")) { + Thread.Sleep(500); + getCateRst = WXUpload.getCategoryOnShelf(shop, aiCateIdLst); + } + if (!getCateRst.Contains("\"code\":0")) + { + Thread.Sleep(500); + getCateRst = WXUpload.getCategoryOnShelf(shop, aiCateIdLst); + } + if (!getCateRst.Contains("\"code\":0")) + { + WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); var error = BaseRegex.GetStringJson(ref getCateRst, "msg"); if (string.IsNullOrEmpty(error)) - error = getCateRst; + error = getCateRst.Replace("{", "【").Replace("}", "】"); return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"获取类目模板失败" + error + "\"}"; } diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs index 0587f79..3298a3f 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.Designer.cs @@ -29,14 +29,14 @@ namespace TemuKJD.WXForms.ShopForms /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); this.pnlSuperManage = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); @@ -115,6 +115,7 @@ namespace TemuKJD.WXForms.ShopForms this.btnTopUpCancel = new DevComponents.DotNetBar.PanelEx(); this.btnTopUpOK = new DevComponents.DotNetBar.PanelEx(); this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); + this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNickNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -143,7 +144,6 @@ namespace TemuKJD.WXForms.ShopForms this.colChangeGiftOemAmountPerOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -1249,20 +1249,20 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvUser.AllowUserToAddRows = false; this.dgvUser.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvUser.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvUser.AutoRowNumber = true; this.dgvUser.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvUser.BackgroundColor = System.Drawing.Color.White; this.dgvUser.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvUser.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1304,6 +1304,31 @@ namespace TemuKJD.WXForms.ShopForms this.dgvUser.TabIndex = 1; this.dgvUser.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvUser_CellContentClick); // + // btnExportShopErp + // + this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; + this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); + this.btnExportShopErp.Name = "btnExportShopErp"; + this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); + this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnExportShopErp.Style.GradientAngle = 90; + this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnExportShopErp.TabIndex = 439; + this.btnExportShopErp.Text = "导出用户到后台系统"; + this.btnExportShopErp.Visible = false; + this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); + // // colCheck // this.colCheck.FillWeight = 30F; @@ -1417,12 +1442,13 @@ namespace TemuKJD.WXForms.ShopForms // // colPlus // - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colPlus.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colPlus.DefaultCellStyle = dataGridViewCellStyle3; this.colPlus.FillWeight = 22F; this.colPlus.HeaderText = "+"; this.colPlus.Name = "colPlus"; this.colPlus.ReadOnly = true; + this.colPlus.Visible = false; // // colShopPointsPerMonth // @@ -1433,8 +1459,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePointsPerMonth // - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePointsPerMonth.DefaultCellStyle = dataGridViewCellStyle4; this.colChangePointsPerMonth.FillWeight = 25F; this.colChangePointsPerMonth.HeaderText = "改"; this.colChangePointsPerMonth.Name = "colChangePointsPerMonth"; @@ -1450,8 +1476,8 @@ namespace TemuKJD.WXForms.ShopForms // // colBalancePlus // - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colBalancePlus.DefaultCellStyle = dataGridViewCellStyle5; this.colBalancePlus.FillWeight = 22F; this.colBalancePlus.HeaderText = "+"; this.colBalancePlus.Name = "colBalancePlus"; @@ -1467,8 +1493,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangePostagePerOrder // - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangePostagePerOrder.DefaultCellStyle = dataGridViewCellStyle6; this.colChangePostagePerOrder.FillWeight = 25F; this.colChangePostagePerOrder.HeaderText = "改"; this.colChangePostagePerOrder.Name = "colChangePostagePerOrder"; @@ -1483,8 +1509,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeRefundPostagePerOrder // - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeRefundPostagePerOrder.DefaultCellStyle = dataGridViewCellStyle7; this.colChangeRefundPostagePerOrder.FillWeight = 25F; this.colChangeRefundPostagePerOrder.HeaderText = "改"; this.colChangeRefundPostagePerOrder.Name = "colChangeRefundPostagePerOrder"; @@ -1501,8 +1527,8 @@ namespace TemuKJD.WXForms.ShopForms // // colChangeGiftOemAmountPerOrder // - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.colChangeGiftOemAmountPerOrder.DefaultCellStyle = dataGridViewCellStyle8; this.colChangeGiftOemAmountPerOrder.FillWeight = 25F; this.colChangeGiftOemAmountPerOrder.HeaderText = "改"; this.colChangeGiftOemAmountPerOrder.Name = "colChangeGiftOemAmountPerOrder"; @@ -1528,31 +1554,6 @@ namespace TemuKJD.WXForms.ShopForms this.deleteColumn.ReadOnly = true; this.deleteColumn.Visible = false; // - // btnExportShopErp - // - this.btnExportShopErp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnExportShopErp.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnExportShopErp.DisabledBackColor = System.Drawing.Color.Empty; - this.btnExportShopErp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportShopErp.Location = new System.Drawing.Point(0, 1); - this.btnExportShopErp.Name = "btnExportShopErp"; - this.btnExportShopErp.Size = new System.Drawing.Size(140, 25); - this.btnExportShopErp.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnExportShopErp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnExportShopErp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnExportShopErp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnExportShopErp.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnExportShopErp.Style.GradientAngle = 90; - this.btnExportShopErp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnExportShopErp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnExportShopErp.TabIndex = 439; - this.btnExportShopErp.Text = "导出用户到后台系统"; - this.btnExportShopErp.Visible = false; - this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); - // // WXOemAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1691,33 +1692,33 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.Label label7; private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrderCancel; private DevComponents.DotNetBar.PanelEx btnGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; - private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName; - private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colCompany; - private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel; - private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName; - private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority; - private System.Windows.Forms.DataGridViewTextBoxColumn colOemId; - private System.Windows.Forms.DataGridViewTextBoxColumn colOemName; - private System.Windows.Forms.DataGridViewTextBoxColumn colPoints; - private System.Windows.Forms.DataGridViewTextBoxColumn colPlus; - private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth; - private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth; - private System.Windows.Forms.DataGridViewTextBoxColumn colBalance; - private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; - private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; - private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; - private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; - private System.Windows.Forms.DataGridViewLinkColumn editColumn; - private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; - } + private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; + private System.Windows.Forms.DataGridViewTextBoxColumn UserIdColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn UserNickNameColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn mobileColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colParentUserName; + private System.Windows.Forms.DataGridViewTextBoxColumn groupIdColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn groupNameColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colCompany; + private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevel; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaLevelName; + private System.Windows.Forms.DataGridViewTextBoxColumn colAuthority; + private System.Windows.Forms.DataGridViewTextBoxColumn colOemId; + private System.Windows.Forms.DataGridViewTextBoxColumn colOemName; + private System.Windows.Forms.DataGridViewTextBoxColumn colPoints; + private System.Windows.Forms.DataGridViewTextBoxColumn colPlus; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopPointsPerMonth; + private System.Windows.Forms.DataGridViewLinkColumn colChangePointsPerMonth; + private System.Windows.Forms.DataGridViewTextBoxColumn colBalance; + private System.Windows.Forms.DataGridViewTextBoxColumn colBalancePlus; + private System.Windows.Forms.DataGridViewTextBoxColumn colPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangePostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeRefundPostagePerOrder; + private System.Windows.Forms.DataGridViewTextBoxColumn colGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn colChangeGiftOemAmountPerOrder; + private System.Windows.Forms.DataGridViewLinkColumn editColumn; + private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; + } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs index a6de26c..61f43f3 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountForm.cs @@ -332,8 +332,11 @@ namespace TemuKJD.WXForms.ShopForms this.txtSearch.GotFocus += TxtSearch_GotFocus; this.txtSearch.LostFocus += TxtSearch_LostFocus; - this.dgvUser.AddMergeColumn(new List { "colPoints", "colPlus" }); - this.dgvUser.AddMergeColumnHeader(new List { "colPoints", "colPlus" }, "积分点数"); + if (colPoints.Visible == true && colPlus.Visible == true) + { + this.dgvUser.AddMergeColumn(new List { "colPoints", "colPlus" }); + this.dgvUser.AddMergeColumnHeader(new List { "colPoints", "colPlus" }, "积分点数"); + } this.dgvUser.AddMergeColumn(new List { "colShopPointsPerMonth", "colChangePointsPerMonth" }); this.dgvUser.AddMergeColumnHeader(new List { "colShopPointsPerMonth", "colChangePointsPerMonth" }, "月费耗点"); this.dgvUser.AddMergeColumn(new List { "colBalance", "colBalancePlus" }); diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index 284e356..95a85da 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -77,10 +77,11 @@ namespace TemuKJD.WXForms.ShopForms if (BaseClass.UserAuthority.Contains("评分考核")) { hideNames.Remove("评分考核"); - } - if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty()) - { - //hideNames.Remove("积分充值"); + } + //if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3 && BaseClass.AgentCode.IsNullOrEmpty() && BaseClass.OemId.IsNullOrEmpty()) + if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3) + { + hideNames.Remove("积分充值"); } if (!BaseClass.OemId.IsNullOrEmpty() && BaseClass.IsOemOwner) {