From 9506266f4b0a710fd451ce98938be0acf76a3cf8 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 10 May 2023 23:45:18 +0800
Subject: [PATCH] 10010

---
 BBWYB.Client/Views/MainWindow.xaml             |  2 +-
 BBWYB.Client/Views/Order/EditPrice.xaml        | 18 ++++++++++--------
 BBWYB.Client/Views/Order/OrderList.xaml        |  7 ++++++-
 .../Controllers/OrderController.cs             | 11 +++++++++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/BBWYB.Client/Views/MainWindow.xaml b/BBWYB.Client/Views/MainWindow.xaml
index 28ba50b..8d831db 100644
--- a/BBWYB.Client/Views/MainWindow.xaml
+++ b/BBWYB.Client/Views/MainWindow.xaml
@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10009" Margin="5,0,0,0"/>
+                <TextBlock Text="v10010" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">
diff --git a/BBWYB.Client/Views/Order/EditPrice.xaml b/BBWYB.Client/Views/Order/EditPrice.xaml
index 70c3850..1a43d59 100644
--- a/BBWYB.Client/Views/Order/EditPrice.xaml
+++ b/BBWYB.Client/Views/Order/EditPrice.xaml
@@ -31,7 +31,7 @@
             <TextBlock Text="订单采购运费" VerticalAlignment="Center"/>
             <c:BTextBox Width="100" Margin="5,0"
                         Text="{Binding FreightAmount}"/>
-            <c:BButton Content="等比均分" Width="80"/>
+            <c:BButton Content="等比均分" Width="80" Command="{Binding DistributFreightCommand}"/>
         </StackPanel>
 
         <Border BorderBrush="{StaticResource Border.Brush}"
@@ -57,11 +57,12 @@
             </Grid>
         </Border>
 
-        <ListBox x:Name="listbox_ordersku" Grid.Row="3" Margin="5,0" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,0,1,1"
-                 ItemsSource="{Binding OrderSkuList}">
+        <ListBox x:Name="listbox_ordersku" Grid.Row="3" Margin="5,0" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"
+                 ItemsSource="{Binding OrderSkuList}"
+                 ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}">
             <ListBox.ItemTemplate>
                 <DataTemplate>
-                    <Grid Width="{Binding ActualWidth,ElementName=listbox_ordersku}">
+                    <Grid Width="{Binding ActualWidth,ElementName=listbox_ordersku,Converter={StaticResource widthConverter},ConverterParameter=3}">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="300"/>
                             <ColumnDefinition/>
@@ -72,7 +73,7 @@
                         <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                         <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
                         <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
-
+                        <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="4" Margin="0,0,-1,0"/>
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="90"/>
@@ -104,13 +105,14 @@
                             </StackPanel>
                         </Grid>
                         <TextBlock Text="{Binding Price}" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
-                        <c:BTextBox Text="{Binding NewPrice}" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-                        <c:BTextBox Text="{Binding FreightAmount}" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                        <c:BTextBox Text="{Binding NewPrice}" Grid.Column="2" Width="50"/>
+                        <c:BTextBox Text="{Binding FreightAmount}" Grid.Column="3" Width="50"/>
                     </Grid>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <c:BButton Content="保存" Grid.Row="4" HorizontalAlignment="Right" Margin="0,0,5,0" Width="80"/>
+        <c:BButton Content="保存" Grid.Row="4" HorizontalAlignment="Right" Margin="0,0,5,0" Width="80"
+                   Command="{Binding SaveCommand}"/>
     </Grid>
 </c:BWindow>
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index 13cb72e..cbab169 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -656,7 +656,7 @@
                                         </StackPanel>
                                     </StackPanel>
 
-                                    <StackPanel Grid.Column="7" VerticalAlignment="Center">
+                                    <StackPanel Grid.Column="7" VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Center">
                                         <c:BButton Content="取消" Style="{StaticResource LinkButton}"
                                                    Command="{Binding DataContext.CancelOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
                                                    CommandParameter="{Binding Id}">
@@ -668,6 +668,11 @@
                                                 </MultiBinding>
                                             </c:BButton.Visibility>
                                         </c:BButton>
+                                        <c:BButton Content="改价" Margin="5,0,0,0"
+                                                   Command="{Binding DataContext.EditPriceCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding }"
+                                                   Style="{StaticResource LinkButton}"
+                                                   Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
                                     </StackPanel>
                                 </Grid>
                                 <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs
index f27f6d1..b596368 100644
--- a/BBWYB.Server.API/Controllers/OrderController.cs
+++ b/BBWYB.Server.API/Controllers/OrderController.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Primitives;
+using SDKAdapter.OperationPlatform.Models;
 
 namespace BBWYB.Server.API.Controllers
 {
@@ -49,5 +50,15 @@ namespace BBWYB.Server.API.Controllers
 
             orderBusiness.CancelOrder(request, token.ToString());
         }
+
+        /// <summary>
+        /// 改价
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void EditPrice([FromBody]OP_EditPriceRequest request)
+        { 
+            orderBusiness.EditPrice(request);
+        }
     }
 }