Merge branch 'master' into liangku_skuoptimazation

BBWYB.Client/App.xaml.cs

@@ -32,7 +32,10 @@ namespace BBWYB.Client
 
 #if DEBUG
             //齐越山鸡
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
+            //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
+
+            //议价2组
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTc2MDk3MTY4ODk2NDUyNjA4MCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3NDIxOTYxMDF9.pt1onwf4f4QKyuT1kFWtcRw8LZo9s64CmHqrdI4fD5k";
 
             //拳探店铺 陈默
             //userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjI0OTUxNjgzNTc2NTAwMjI0IiwidGVhbUlkIjoiMTYyMDM0MjAxNDcwNjk3ODgxNiIsInNvblRlYW1JZHMiOiIxNjIwMzQyMDE0NzA2OTc4ODE2LDE2MjAzNDM4Mjc0NzI1ODQ3MDQsMTYyMDM0NDAzMzczNTg3MjUxMiwxNjIwMzQ0MDkyODI5NDIxNTY4LDE2MjAzNDQxNDA4NTAwMDgwNjQiLCJleHAiOjE3MjA3NjQzMjV9.Q8fiKXCHgvzbm7NDEre-MeoSju_AmC6Ae6eDY22rUAw";

BBWYB.Client/GlobalContext.cs

@@ -20,7 +20,7 @@ namespace BBWYB.Client
     {
         public GlobalContext()
         {
-            BBWYBApiVersion = "10038";
+            BBWYBApiVersion = "10040";
         }
 
         private User user;

BBWYB.Client/Views/Web.xaml.cs

@@ -43,9 +43,9 @@ 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 url = "http://192.168.1.2:8080";
+            //var url = "http://192.168.1.2:8080";
             var registerName = "webTestContext";
             //var url = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "s.html");
 #else

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -662,14 +662,17 @@ namespace BBWYB.Server.Business
         public void EditPrice(OP_EditPriceRequest request)
         {
             var client = opPlatformClientFactory.GetClient(request.Platform);
-            client.EditPrice(new OP_EditPriceRequest()
+            lock ($"editprice_{request.OrderId}")
             {
-                AppKey = request.AppKey,
-                AppSecret = request.AppSecret,
-                AppToken = request.AppToken,
-                OrderId = request.OrderId,
-                EditItems = request.EditItems
-            });
+                client.EditPrice(new OP_EditPriceRequest()
+                {
+                    AppKey = request.AppKey,
+                    AppSecret = request.AppSecret,
+                    AppToken = request.AppToken,
+                    OrderId = request.OrderId,
+                    EditItems = request.EditItems
+                });
+            }
 
             var orderListResponse = client.GetOrderList(new OP_QueryOrderRequest()
             {

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -3172,14 +3172,17 @@ namespace BBWYB.Server.Business
                 {
                     #region 通知拳探改价
                     var opclient = opPlatformClientFactory.GetClient(AdapterEnums.PlatformType.拳探);
-                    opclient.EditPrice(new OP_EditPriceRequest()
+                    lock ($"editprice_{dbOrder.Id}")
                     {
-                        AppKey = shop.AppKey,
-                        AppSecret = shop.AppSecret,
-                        AppToken = shop.AppToken,
-                        OrderId = dbOrder.Id,
-                        EditItems = op_EditPriceSkuRequests
-                    });
+                        opclient.EditPrice(new OP_EditPriceRequest()
+                        {
+                            AppKey = shop.AppKey,
+                            AppSecret = shop.AppSecret,
+                            AppToken = shop.AppToken,
+                            OrderId = dbOrder.Id,
+                            EditItems = op_EditPriceSkuRequests
+                        });
+                    }
                     #endregion
 
                     #region 通知C端改价

WebTest/App.xaml.cs

@@ -25,7 +25,7 @@ namespace WebTest
             string userToken = string.Empty;
 
             //齐越山鸡
-            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNzI2MzAwNjY0fQ.hPSbgJEuTt0MLy_7YkSJX4rRG3drJAfso-5IS8ZlOkY";
+            userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMzk1NzA4MjA4NjU1MzcyMjg4IiwidGVhbUlkIjoiMTc2MDk3MTY4ODk2NDUyNjA4MCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE3NDIxOTYxMDF9.pt1onwf4f4QKyuT1kFWtcRw8LZo9s64CmHqrdI4fD5k";
 
             gl.UserToken = userToken;