pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

服务单查询接口更新

qianyi
shanji 3 years ago
parent
978e71ca83
commit
09765631c2
6 changed files with 71 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/Resources/Themes/Color.xaml
  2. 108
      BBWY.Client/Views/Order/OrderList.xaml
  3. 25
      BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
  4. 2
      BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
  5. 4
      BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
  6. 2
      BBWY.Test/Program.cs

2
BBWY.Client/Resources/Themes/Color.xaml
View File

@ -29,4 +29,6 @@
<SolidColorBrush x:Key="MainMenu.BackGround" Color="#F2F2F2"/> <SolidColorBrush x:Key="MainMenu.BackGround" Color="#F2F2F2"/>
<SolidColorBrush x:Key="MainMenu.BorderBrush" Color="#D7D7D7"/> <SolidColorBrush x:Key="MainMenu.BorderBrush" Color="#D7D7D7"/>
<SolidColorBrush x:Key="Text.Pink" Color="#EC808D"/>
</ResourceDictionary> </ResourceDictionary>

108
BBWY.Client/Views/Order/OrderList.xaml
View File

@ -191,7 +191,7 @@
<RowDefinition Height="0.5*"/> <RowDefinition Height="0.5*"/>
<RowDefinition Height="0.5*"/> <RowDefinition Height="0.5*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Style="{StaticResource middleTextBlock}" FontSize="25" Foreground="#EC808D" Grid.RowSpan="2"> <TextBlock Style="{StaticResource middleTextBlock}" FontSize="25" Foreground="{StaticResource Text.Pink}" Grid.RowSpan="2">
<Run Text="业绩"/> <Run Text="业绩"/>
<LineBreak/> <LineBreak/>
<Run Text="统计"/> <Run Text="统计"/>
@ -217,7 +217,7 @@
<LineBreak/> <LineBreak/>
<Run Text="{Binding ToDayOrderAchievement.TotalCost}"/> <Run Text="{Binding ToDayOrderAchievement.TotalCost}"/>
</TextBlock> </TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0"> <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<StackPanel> <StackPanel>
@ -374,7 +374,6 @@
<TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}" <TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}"
IsReadOnly="True" Background="Transparent" BorderThickness="0"/> IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
@ -441,7 +440,7 @@
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="#EC808D" <c:BButton Content="修改售后" Padding="5,0" Margin="5,0,0,0" Background="{StaticResource Text.Pink}"
Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=已完成:Visible:Collapsed}" Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}},Converter={StaticResource objConverter},ConverterParameter=已完成:Visible:Collapsed}"
Command="{Binding DataContext.EditAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"> Command="{Binding DataContext.EditAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
<c:BButton.CommandParameter> <c:BButton.CommandParameter>
@ -466,9 +465,9 @@
<Run Text="买家备注:" /> <Run Text="买家备注:" />
<Run Text="{Binding BuyerRemark}"/> <Run Text="{Binding BuyerRemark}"/>
</TextBlock> </TextBlock>
<Border BorderBrush="#EC808D" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2" <Border BorderBrush="{StaticResource Text.Pink}" BorderThickness="1" HorizontalAlignment="Left" Padding="5,2"
Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}"> Visibility="{Binding IsRefund,ConverterParameter=true:Visible:Collapsed,Converter={StaticResource objConverter}}">
<TextBlock Text="售后" Foreground="#EC808D"/> <TextBlock Text="售后" Foreground="{StaticResource Text.Pink}"/>
</Border> </Border>
</StackPanel> </StackPanel>
@ -589,7 +588,7 @@
<Run Text="{Binding ActualAmount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding ActualAmount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock> </TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0"> <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<StackPanel> <StackPanel>
@ -619,7 +618,7 @@
<Run Text="{Binding PreferentialAmount}"/> <Run Text="{Binding PreferentialAmount}"/>
</TextBlock> </TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0"> <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<ListBox ItemsSource="{Binding OrderCouponList}" <ListBox ItemsSource="{Binding OrderCouponList}"
@ -646,7 +645,7 @@
<Path x:Name="path_purchaseAmount_question" <Path x:Name="path_purchaseAmount_question"
Style="{StaticResource path_question}" Style="{StaticResource path_question}"
Width="14" Margin="5,0,0,0" Fill="#EC808D" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.InitialShowDelay="0"
ToolTipService.ShowDuration="20000"> ToolTipService.ShowDuration="20000">
<Path.ToolTip> <Path.ToolTip>
@ -775,7 +774,7 @@
<Run Text="{Binding OrderCost.TotalReissue,Mode=OneWay}"/> <Run Text="{Binding OrderCost.TotalReissue,Mode=OneWay}"/>
</TextBlock> </TextBlock>
<Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="#EC808D" ToolTipService.InitialShowDelay="0"> <Path Style="{StaticResource path_question}" Width="14" Margin="5,0,0,0" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip> <Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}"> <ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<StackPanel> <StackPanel>
@ -854,58 +853,11 @@
Visibility="{Binding Visibility,ElementName=btn_outStore}"/> Visibility="{Binding Visibility,ElementName=btn_outStore}"/>
</Grid> </Grid>
<TextBlock Text="{Binding OrderState}" Grid.Column="6" <TextBlock Text="{Binding OrderState}" Grid.Column="6"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"> VerticalAlignment="Center"/>
<!--<TextBlock.Visibility>
<MultiBinding Converter="{StaticResource mobjConverter}"
ConverterParameter=";true:&amp;:Collapsed:Visible:1">
<Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/>
<Binding Path="IsAfterSaleOrder"/>
</MultiBinding>
</TextBlock.Visibility>-->
</TextBlock>
<!--<ListBox x:Name="listbox_afterSaleOrder1"
Grid.Column="6"
ItemsSource="{Binding AfterSaleOrderList}"
Style="{StaticResource NoScrollViewListBoxStyle}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
VerticalAlignment="Center"
Foreground="{StaticResource Text.Color}">
<ListBox.Visibility>
<MultiBinding Converter="{StaticResource mobjConverter}"
ConverterParameter=";true:&amp;:Visible:Collapsed:1">
<Binding Path="DataContext.IncludeAfterOrder" RelativeSource="{RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}"/>
<Binding Path="IsAfterSaleOrder"/>
</MultiBinding>
</ListBox.Visibility>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Grid.Column="2"
Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder1}"
Height="{Binding RefundAmount,Converter={StaticResource objConverter},ConverterParameter=0|0.0|0.00:115:136}">
<StackPanel VerticalAlignment="Center"
HorizontalAlignment="Center"
Visibility="{Binding IsPlaceholder,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}">
<TextBlock>
<Run Text="订单状态"/>
<Run Text="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"/>
</TextBlock>
<TextBlock>
<Run Text="售后信息"/>
<Run Text="{Binding ServiceResult,ConverterParameter=#null:未处理:#source,Converter={StaticResource objConverter}}"/>
</TextBlock>
</StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"
DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
Visibility="{Binding ItemList.Count,Converter={StaticResource objConverter},ConverterParameter=1:Collapsed:Visible}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>-->
<StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0"> <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
<StackPanel x:Name="sp_buyerRemark"> <StackPanel x:Name="sp_buyerRemark">
@ -1007,7 +959,45 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder,Converter={StaticResource widthConverter},ConverterParameter=-0}"> <Grid Width="{Binding ActualWidth,ElementName=listbox_afterSaleOrder,Converter={StaticResource widthConverter},ConverterParameter=-0}">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Background="#F2F2F2">
<StackPanel Orientation="Horizontal">
<Border BorderBrush="{StaticResource Text.Pink}" BorderThickness="1"
Background="White"
Padding="5,0"
Height="25">
<TextBlock Text="{Binding ServiceResult,Converter={StaticResource objConverter},ConverterParameter=#null:服务单未结束:#source}"
Foreground="{StaticResource Text.Pink}"
VerticalAlignment="Center"/>
</Border>
<TextBlock Text="{Binding ApplyTime,StringFormat=yyyy-MM-dd HH:mm:ss}" VerticalAlignment="Center" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="服务单号:" Margin="5,0,0,0" />
<c:BButton Content="{Binding ServiceId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding ServiceId}" Margin="5,0,0,0"/>
<Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
<TextBlock VerticalAlignment="Center" Text="订单号:" Margin="5,0,0,0" />
<c:BButton Content="{Binding OrderId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding OrderId}" Margin="5,0,0,0"/>
<Border Width="1" Margin="5,5,0,5" Background="{StaticResource Border.Brush}"/>
<StackPanel x:Name="txt_consignee" Margin="5,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="收货人:"/>
<TextBox Text="{Binding Consignee.ContactName}" Foreground="{StaticResource Text.Color}"
IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
<TextBlock Text="联系电话:" Margin="5,0,0,0"/>
<TextBox Text="{Binding Consignee.Mobile}" Foreground="{StaticResource Text.Color}"
IsReadOnly="True" Background="Transparent" BorderThickness="0"/>
</StackPanel>
</StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>

25
BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
View File

@ -14,25 +14,26 @@ namespace BBWY.Server.Business
public AfterSaleOrderListResponse GetAfterSaleOrderList(SearchAfterSaleOrderRequest request) public AfterSaleOrderListResponse GetAfterSaleOrderList(SearchAfterSaleOrderRequest request)
{ {
var select = fsql.Select<AfterSaleOrder, OrderSku>().InnerJoin((aso, osku) => aso.OrderId == osku.OrderId && aso.SkuId == osku.SkuId); var select = fsql.Select<AfterSaleOrder, OrderSku, OrderConsignee>().InnerJoin((aso, osku, oc) => aso.OrderId == osku.OrderId && aso.SkuId == osku.SkuId)
.InnerJoin((aso, osku, oc) => aso.OrderId == oc.OrderId);
if (!string.IsNullOrEmpty(request.ServiceId)) if (!string.IsNullOrEmpty(request.ServiceId))
{ {
select = select.Where((aso, osku) => aso.ServiceId == request.ServiceId); select = select.Where((aso, osku, o) => aso.ServiceId == request.ServiceId);
} }
else else
{ {
select = select.WhereIf(request.StartDate != null, (aso, osku) => aso.ApplyTime >= request.StartDate) select = select.WhereIf(request.StartDate != null, (aso, osku, oc) => aso.ApplyTime >= request.StartDate)
.WhereIf(request.EndDate != null, (aso, osku) => aso.ApplyTime <= request.EndDate) .WhereIf(request.EndDate != null, (aso, osku, oc) => aso.ApplyTime <= request.EndDate)
.WhereIf(!string.IsNullOrEmpty(request.Spu), (aso, osku) => aso.ProductId == request.Spu) .WhereIf(!string.IsNullOrEmpty(request.Spu), (aso, osku, oc) => aso.ProductId == request.Spu)
.WhereIf(!string.IsNullOrEmpty(request.Sku), (aso, osku) => aso.SkuId == request.Sku) .WhereIf(!string.IsNullOrEmpty(request.Sku), (aso, osku, oc) => aso.SkuId == request.Sku)
.WhereIf(!string.IsNullOrEmpty(request.OrderId), (aso, osku) => aso.OrderId == request.OrderId); .WhereIf(!string.IsNullOrEmpty(request.OrderId), (aso, osku, oc) => aso.OrderId == request.OrderId);
} }
select = select.Where((aso, osku) => aso.ShopId == request.ShopId) select = select.Where((aso, osku, oc) => aso.ShopId == request.ShopId)
.OrderByDescending((aso, osku) => aso.ApplyTime) .OrderByDescending((aso, osku, oc) => aso.ApplyTime)
.Count(out var total) .Count(out var total)
.Page(request.PageIndex, request.PageSize); .Page(request.PageIndex, request.PageSize);
var list = select.ToList((aso, osku) => new AfterSaleOrderResponse var list = select.ToList((aso, osku, oc) => new AfterSaleOrderResponse
{ {
Id = aso.Id, Id = aso.Id,
ApplyTime = aso.ApplyTime, ApplyTime = aso.ApplyTime,
@ -58,7 +59,9 @@ namespace BBWY.Server.Business
ServiceResult = aso.ServiceResult, ServiceResult = aso.ServiceResult,
ShopId = aso.ShopId, ShopId = aso.ShopId,
SkuId = aso.SkuId, SkuId = aso.SkuId,
Title = osku.Title Title = osku.Title,
ContactName = oc.ContactName,
Mobile = oc.Mobile
}); });
return new AfterSaleOrderListResponse() return new AfterSaleOrderListResponse()
{ {

2
BBWY.Server.Business/Sync/AfterSaleOrderSyncBusiness.cs
View File

@ -57,7 +57,7 @@ namespace BBWY.Server.Business
private void SyncJDAfterOrder(JArray afterOrderTokenJArray, ShopResponse shopResponse) private void SyncJDAfterOrder(JArray afterOrderTokenJArray, ShopResponse shopResponse)
{ {
var shopId = long.Parse(shopResponse.ShopId); var shopId = long.Parse(shopResponse.ShopId);
var validAfterOrderJArray = afterOrderTokenJArray.Where(j => j.Value<int>("serviceStatus") == 10010 && //完成 var validAfterOrderJArray = afterOrderTokenJArray.Where(j => j.Value<int>("serviceStatus") != 10011 && //取消
processResultDic.ContainsKey(j.Value<int>("processResult"))); processResultDic.ContainsKey(j.Value<int>("processResult")));

4
BBWY.Server.Model/Dto/Response/AfterSaleOrder/AfterSaleOrderResponse.cs
View File

@ -7,5 +7,9 @@ namespace BBWY.Server.Model.Dto
public string Logo { get; set; } public string Logo { get; set; }
public string Title { get; set; } public string Title { get; set; }
public string ContactName { get; set; }
public string Mobile { get; set; }
} }
} }

2
BBWY.Test/Program.cs
View File

@ -26,7 +26,7 @@ namespace BBWY.Test
//req.operatePin = "开发测试"; //req.operatePin = "开发测试";
//req.operateNick = "开发测试"; //req.operateNick = "开发测试";
//req.pageNumber = "1"; //req.pageNumber = "1";
//req.pageSize ="50"; //req.pageSize = "50";
//req.serviceId = 1472302469; //req.serviceId = 1472302469;
//AscQueryListResponse response1 = jdClient.Execute(req, token, DateTime.Now.ToLocalTime()); //AscQueryListResponse response1 = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());

Write Preview
Loading…
Cancel
Save