Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb

BBWYB.Client/App.xaml.cs

@@ -37,7 +37,10 @@ namespace BBWYB.Client
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
 
             //议价2组
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNzYwOTcxNjg4OTY0NTI2MDgwIiwiZXhwIjoxNzQyNjMwODk0fQ.Vtq2MU1Qd9Oo192udkA01ZAwiQgQxj2m-pkayGZ1d3I";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNzYwOTcxNjg4OTY0NTI2MDgwIiwiZXhwIjoxNzQyNjMwODk0fQ.Vtq2MU1Qd9Oo192udkA01ZAwiQgQxj2m-pkayGZ1d3I";
+
+            //齐越艾伦
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjg2MTk4MzQzMjcwNjY2MjQwIiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNDU4NzAxNzE4MjI0MTEzNjY0LDE2MjAzNDIwMTQ3MDY5Nzg4MTYiLCJleHAiOjE3NDQxNzg3NjR9.lPHkPwG7inb_08T8aFDnPlSv7EKkWx7Jzp9R56DsAO4";
 
             //拳探店铺 陈默
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDM4Mjc0NzI1ODQ3MDQsMTYyMDM0NDAzMzczNTg3MjUxMiwxNjIwMzQ0MDkyODI5NDIxNTY4LDE2MjAzNDQxNDA4NTAwMDgwNjQiLCJleHAiOjE3MjA3NjQzMjV9.Q8fiKXCHgvzbm7NDEre-MeoSju_AmC6Ae6eDY22rUAw";

BBWYB.Client/GlobalContext.cs

@@ -27,7 +27,7 @@ namespace BBWYB.Client
     {
         public GlobalContext()
         {
-            BBWYBApiVersion = "10042";
+            BBWYBApiVersion = "10043";
         }
 
         public List<_1688CookieModel> _1688CookieList { get; set; } = new List<_1688CookieModel>();

BBWYB.Client/ViewModels/WebVM.cs

@@ -51,29 +51,43 @@ namespace BBWYB.Client.ViewModels
 
 
                 IList<Department> departmentList = null;
+                var response = mdsApiService.GetShopDetailList();
+                if (!response.Success)
+                    throw new Exception(response.Msg);
+                departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList();
+
+
+                var res = shopService.GetDepartmentList();
+                if (!res.Success)
+                    throw new Exception(res.Msg);
+                var allDepartmentList = res.Data.Map<IList<Department>>();
+                var shopList = new List<Shop>();
+                foreach (var d in allDepartmentList)
+                    shopList.AddRange(d.ShopList);
+                GlobalContext.User.ShopList = shopList;
+
+                //if (managerDepartment.Contains(GlobalContext.User.TeamName) ||
+                //   managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
+                //{
+                //    var res = shopService.GetDepartmentList();
+                //    if (!res.Success)
+                //        throw new Exception(res.Msg);
+                //    var allDepartmentList = res.Data.Map<IList<Department>>();
 
-                if (managerDepartment.Contains(GlobalContext.User.TeamName) ||
+
-                   managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
+                //    var shopList = new List<Shop>();
-                {
+                //    foreach (var d in allDepartmentList)
-                    var res = shopService.GetDepartmentList();
+                //        shopList.AddRange(d.ShopList);
-                    if (!res.Success)
+                //    GlobalContext.User.ShopList = shopList;
-                        throw new Exception(res.Msg);
+                //    departmentList = allDepartmentList.Where(d => d.Name.Contains("供应链")).ToList();
-                    var allDepartmentList = res.Data.Map<IList<Department>>();
+                //}
-
+                //else
-
+                //{
-                    var shopList = new List<Shop>();
+                //    var response = mdsApiService.GetShopDetailList();
-                    foreach (var d in allDepartmentList)
+                //    if (!response.Success)
-                        shopList.AddRange(d.ShopList);
+                //        throw new Exception(response.Msg);
-                    GlobalContext.User.ShopList = shopList;
+                //    departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList();
-                    departmentList = allDepartmentList.Where(d => d.Name.Contains("供应链")).ToList();
+                //}
-                }
-                else
-                {
-                    var response = mdsApiService.GetShopDetailList();
-                    if (!response.Success)
-                        throw new Exception(response.Msg);
-                    departmentList = response.Data.Where(d => d.Name.Contains("供应链")).ToList();
-                }
 
                 if (departmentList.Count == 0)
                     throw new Exception("缺少有效的部门数据");

BBWYB.Client/Views/Web.xaml.cs

@@ -52,10 +52,10 @@ namespace BBWYB.Client.Views
         private void initWebView()
         {
 #if DEBUG
-            //var url = "http://qtbbwy.qiyue666.com";
+            var url = "http://qtbbwy.qiyue666.com";
-            //var registerName = "webContext";
+            var registerName = "webContext";
-            var url = "http://192.168.1.2:8080";
+            //var url = "http://192.168.1.2:8080";
-            var registerName = "webTestContext";//webTestContext
+            //var registerName = "webTestContext";//webTestContext
             //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html");
 #else
             var url = "http://qtbbwy.qiyue666.com";

BBWYB.Server.Business/PurchaseScheme/PurchaseSchemeBusiness.cs

@@ -369,8 +369,10 @@ namespace BBWYB.Server.Business
                     });
                     var noCurrentBargainTeamList = dbPurchaserList.Where(dp => !string.IsNullOrEmpty(dp.BelongBargainTeamId) &&
                                                                                 dp.BelongBargainTeamId != uInfo.bargainTeam.Id).ToList();
+                    //if (noCurrentBargainTeamList.Count() > 0)
+                    //    throw new BusinessException($"不能包含被其他议价组使用的采购商 [{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}]");
                     if (noCurrentBargainTeamList.Count() > 0)
-                        throw new BusinessException($"不能包含被其他议价组使用的采购商 [{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}]");
+                        throw new BusinessException($"该商品的供应商,已归属其他议价组.保存失败~!\r\n{string.Join(",", noCurrentBargainTeamList.Select(x => x.Name))}");
                 }
                 #endregion
 

BBWYB.Server.Business/SkuOptimization/OptimizationBusiness.cs

@@ -318,7 +318,7 @@ namespace BBWYB.Server.Business
                         //SkuId = waitCheckOrderSku.SkuId,
                         TaskType = Enums.TimeLimitTaskType.待议价任务,
                         TaskId = spuOptimizationTask.Id,
-                        Remark = "首次采购限时任务"
+                        Remark = $"{reason}限时任务"
                     });
                 }
                 #endregion