1

BBWY.Client/Views/MainWindow.xaml

@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10021" Margin="5,0,0,0"/>
+                <TextBlock Text="v10022" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">

BBWY.Server.Business/MDSBusiness.cs

@@ -43,7 +43,7 @@ namespace BBWY.Server.Business
                 AppSecret = shopJToken.Value<string>("AppSecret"),
                 AppToken = shopJToken.Value<string>("AppToken"),
                 PlatformId = (Enums.Platform)shopJToken.Value<int>("PlatformId"),
-                VenderType = shopJToken.Value<string>("ShopType"),
+                ShopType = shopJToken.Value<string>("ShopType"),
                 ShopId = shopId.ToString(),
                 ShopName = shopJToken.Value<string>("ShopName"),
                 ManagePwd = shopJToken.Value<string>("ManagePwd")

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -927,7 +927,7 @@ namespace BBWY.Server.Business
                     PageIndex = 1,
                     PageSize = 100,
                     Platform = shop.PlatformId,
-                    JDColType = string.IsNullOrEmpty(shop.VenderType) ? "0" : shop.VenderType,
+                    JDColType = string.IsNullOrEmpty(shop.ShopType) ? "0" : shop.ShopType,
                     SaveResponseLog = true,
                     OrderId = orderId
                 }, null, HttpMethod.Post);

BBWY.Server.Business/Vender/VenderBusiness.cs

@@ -190,7 +190,7 @@ namespace BBWY.Server.Business
                         PlatformCommissionRatio = x.PlatformCommissionRatio,
                         ShopId = x.ShopId,
                         ShopName = x.ShopName,
-                        VenderType = x.ShopType
+                        ShopType = x.ShopType
                     }).ToList()
                 };
                 departmentList.Add(department);

BBWY.Server.Model/Dto/Response/Vender/ShopResponse.cs

@@ -15,7 +15,7 @@ namespace BBWY.Server.Model.Dto
         /// <summary>
         /// 商家类型
         /// </summary>
-        public string VenderType { get; set; }
+        public string ShopType { get; set; }
 
         /// <summary>
         /// 店铺平台