绑定商品业务限制调整

BBWY.Client/App.xaml.cs

@@ -32,10 +32,10 @@ namespace BBWY.Client
             string userToken = string.Empty;
 #if DEBUG
             //齐越山鸡
-            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
 
             //刷单组测试
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
             //齐越愉辰
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDM5OTEyNDU1MzExNDYyNDAwIiwidGVhbUlkIjoiMTQzOTg5ODYxNzM1ODg0ODAwMCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUwNDA0ODZ9.0TvEhPzTeKvpQY31E5YhgfvRBJHYdvwWRrEHNnF9kkA";
             //齐越悠仁

BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs

@@ -268,7 +268,7 @@ namespace BBWY.Client.ViewModels
             }
             else if (productSku.SelectedPurchaseScheme.PurchaseSchemeProductList.Count >= 4)
             {
-                MessageBox.Show("该采购方案的商品数量已达上限(4)");
+                MessageBox.Show("该采购方案的商品数量已达上限(5)");
                 return;
             }
 
@@ -323,10 +323,10 @@ namespace BBWY.Client.ViewModels
             {
                 LoadPurchaseProduct(sku.SelectedPurchaseScheme.PurchasePlatform, purchaseSchemeProduct, purchaseProductId, (p) =>
                 {
-                    if (sku.PurchaseSchemeList.Any(s => s.PurchaserId == p))
+                    if (sku.PurchaseSchemeList.Any(s => s.Id != sku.SelectedPurchaseScheme.Id && s.PurchaserId == p))
-                        return $"sku{sku.Id}的采购方案中已存在相同的采购商";
+                        return $"sku{sku.Id}的采购方案中已存在相同的采购商"; //同一个sku中的采购方案不能有相同的采购商
 
-                    if (!string.IsNullOrEmpty(PurchaserId) && p != PurchaserId)
+                    if (!string.IsNullOrEmpty(PurchaserId) && p != PurchaserId)  //同一批操作的sku必须为相同的采购商
                         return "采购商必须相同";
 
                     return string.Empty;

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1002,7 +1002,7 @@ namespace BBWY.Server.Business
                 var orderJToken = JToken.Parse(orderApiResult.Content);
                 var orderInfoJToken = orderJToken["Data"]["jingdong_pop_order_notPayOrderById_responce"]["orderDataNotPayInfo"];
                 if (orderInfoJToken == null || !orderInfoJToken.HasValues)
-                    throw new BusinessException("未查询到代付款订单");
+                    throw new BusinessException("未查询到待付款订单");
 
                 orderResponse = new OrderResponse()
                 {