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

1.新增单个订单查询接口 

2.新增修改商家备注接口
qianyi
shanji 3 years ago
parent
eee0543366
commit
9b5e308e76
3 changed files with 152 additions and 14 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. 38
      BBWY.Client/Views/Order/OrderList.xaml
  2. 21
      BBWY.Server.API/Controllers/OrderController.cs
  3. 107
      BBWY.Server.Business/Order/OrderBusiness.cs

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

@ -701,16 +701,30 @@
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0"> <StackPanel Orientation="Vertical" Grid.Column="7" Margin="5,5,5,0">
<TextBlock x:Name="txtBuyerRemark" TextWrapping="Wrap"> <StackPanel x:Name="sp_buyerRemark">
<Run Text="买家备注"/> <StackPanel Orientation="Horizontal">
<Run Text="{Binding BuyerRemark}"/> <TextBlock Text="买家备注"/>
</TextBlock> <c:BButton Content="复制" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
<TextBlock x:Name="txtVenderRemark" TextWrapping="Wrap"> Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
<Path x:Name="path_flag" Style="{StaticResource path_flag}" Width="16" CommandParameter="{Binding BuyerRemark}"/>
Fill="{Binding Flag}"/> </StackPanel>
<Run Text="商家备注"/> <TextBlock Text="{Binding BuyerRemark}" TextWrapping="Wrap"/>
<Run Text="{Binding VenderRemark}"/> </StackPanel>
</TextBlock>
<StackPanel x:Name="sp_venderRemark" Margin="0,5,0,0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="商家备注"/>
<c:BButton x:Name="btn_copyVenderRemark" Content="复制" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding VenderRemark}"/>
<c:BButton Content="修改" Style="{StaticResource LinkButton}" Margin="5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Path x:Name="path_flag" Style="{StaticResource path_flag}" Width="16"
Fill="{Binding Flag}"/>
<TextBlock TextWrapping="Wrap" Text="{Binding VenderRemark}"/>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
@ -726,10 +740,10 @@
<Setter TargetName="txt_storeName" Property="Visibility" Value="Collapsed"/> <Setter TargetName="txt_storeName" Property="Visibility" Value="Collapsed"/>
</DataTrigger>--> </DataTrigger>-->
<DataTrigger Binding="{Binding BuyerRemark}" Value=""> <DataTrigger Binding="{Binding BuyerRemark}" Value="">
<Setter TargetName="txtBuyerRemark" Property="Visibility" Value="Collapsed"/> <Setter TargetName="sp_buyerRemark" Property="Visibility" Value="Collapsed"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding VenderRemark}" Value=""> <DataTrigger Binding="{Binding VenderRemark}" Value="">
<Setter TargetName="txtVenderRemark" Property="Visibility" Value="Collapsed"/> <Setter TargetName="btn_copyVenderRemark" Property="Visibility" Value="Collapsed"/>
</DataTrigger> </DataTrigger>
<DataTrigger Binding="{Binding Consignee.IsDecode}" Value="True"> <DataTrigger Binding="{Binding Consignee.IsDecode}" Value="True">
<Setter Property="Visibility" Value="Visible" TargetName="txt_consignee"/> <Setter Property="Visibility" Value="Visible" TargetName="txt_consignee"/>

21
BBWY.Server.API/Controllers/OrderController.cs
View File

@ -27,6 +27,17 @@ namespace BBWY.Server.API.Controllers
return orderBusiness.GetOrderList(searchOrderRequest); return orderBusiness.GetOrderList(searchOrderRequest);
} }
/// <summary>
/// 获取单个订单详情
/// </summary>
/// <param name="orderId"></param>
/// <returns></returns>
[HttpGet("{orderId}")]
public OrderResponse GetOrderById([FromRoute] string orderId)
{
return orderBusiness.GetOrderById(orderId);
}
/// <summary> /// <summary>
/// 解密收货人信息 /// 解密收货人信息
/// </summary> /// </summary>
@ -88,6 +99,16 @@ namespace BBWY.Server.API.Controllers
orderBusiness.OutStock(outStockRequest); orderBusiness.OutStock(outStockRequest);
} }
/// <summary>
/// 修改商家备注
/// </summary>
/// <param name="editVenderRemarkRequest"></param>
[HttpPost]
public void EditVenderRemark([FromBody] EditVenderRemarkRequest editVenderRemarkRequest)
{
orderBusiness.EditVenderRemark(editVenderRemarkRequest);
}
/// <summary> /// <summary>
/// 指定时间范围的订单同步 /// 指定时间范围的订单同步
/// </summary> /// </summary>

107
BBWY.Server.Business/Order/OrderBusiness.cs
View File

@ -80,8 +80,6 @@ namespace BBWY.Server.Business
.Count(out var total) .Count(out var total)
.Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize); .Page(searchOrderRequest.PageIndex, searchOrderRequest.PageSize);
var sql = select.ToSql();
var orderSourceList = select.ToList((o, ocs, oct, ods) => new Order() var orderSourceList = select.ToList((o, ocs, oct, ods) => new Order()
{ {
Id = o.Id, Id = o.Id,
@ -170,6 +168,78 @@ namespace BBWY.Server.Business
return response; return response;
} }
public OrderResponse GetOrderById(string orderId)
{
var order = fsql.Select<Order, OrderConsignee, OrderCost, OrderDropShipping>().LeftJoin((o, ocs, oct, ods) => o.Id == ocs.OrderId)
.LeftJoin((o, ocs, oct, ods) => o.Id == oct.OrderId)
.LeftJoin((o, ocs, oct, ods) => o.Id == ods.OrderId)
.Where((o, ocs, oct, ods) => o.Id == orderId)
.ToOne((o, ocs, oct, ods) => new Order()
{
Id = o.Id,
BuyerRemark = o.BuyerRemark,
EndTime = o.EndTime,
FreightPrice = o.FreightPrice,
ModifyTime = o.ModifyTime,
OrderPayment = o.OrderPayment,
OrderSellerPrice = o.OrderSellerPrice,
OrderState = o.OrderState,
OrderTotalPrice = o.OrderTotalPrice,
OrderType = o.OrderType,
PayType = o.PayType,
Platform = o.Platform,
ShopId = o.ShopId,
StartTime = o.StartTime,
StorageType = o.StorageType,
StoreId = o.StoreId,
StoreOrder = o.StoreOrder,
VenderRemark = o.VenderRemark,
PurchaseRemark = o.PurchaseRemark,
WaybillNo = o.WaybillNo,
Flag = o.Flag,
SDType = o.SDType,
ContactName = ocs.ContactName,
Address = ocs.Address,
Province = ocs.Province,
County = ocs.County,
Town = ocs.Town,
City = ocs.City,
IsDecode = ocs.IsDecode,
Mobile = ocs.Mobile,
TelePhone = ocs.TelePhone,
DeliveryExpressFreight = oct.DeliveryExpressFreight,
PlatformCommissionAmount = oct.PlatformCommissionAmount,
PlatformCommissionRatio = oct.PlatformCommissionRatio,
PreferentialAmount = oct.PreferentialAmount,
Profit = oct.Profit,
PurchaseAmount = oct.PurchaseAmount,
IsManualEdited = oct.IsManualEdited,
SDCommissionAmount = oct.SDCommissionAmount,
BuyerAccount = ods.BuyerAccount,
DeliveryFreight = ods.DeliveryFreight,
PurchaseOrderId = ods.PurchaseOrderId,
PurchasePlatform = ods.PurchasePlatform,
SellerAccount = ods.SellerAccount,
});
if (order == null)
throw new BusinessException("订单不存在");
var orderResponse = order.Map<OrderResponse>();
var orderSkuList = fsql.Select<OrderSku>().Where(osku => osku.OrderId == orderId).ToList().Map<IList<OrderSkuResponse>>();
var orderCouponList = fsql.Select<OrderCoupon>().Where(oc => oc.OrderId == orderId).ToList().Map<IList<OrderCouponResponse>>();
var orderCostDetailList = fsql.Select<OrderCostDetail>().Where(ocd => ocd.OrderId == orderId).ToList().Map<IList<OrderCostDetailResponse>>();
orderResponse.ItemList = orderSkuList;
orderResponse.OrderCouponList = orderCouponList;
orderResponse.OrderCostDetailList = orderCostDetailList;
orderResponse.StoreName = globalConfig.Stores.FirstOrDefault(s => s.StoreId == orderResponse.StoreId)?.StoreName ?? order.StoreId;
return orderResponse;
}
/// <summary> /// <summary>
/// 解密 /// 解密
/// </summary> /// </summary>
@ -632,6 +702,11 @@ namespace BBWY.Server.Business
}); });
} }
/// <summary>
/// 出库
/// </summary>
/// <param name="outStockRequest"></param>
/// <exception cref="BusinessException"></exception>
public void OutStock(OutStockRequest outStockRequest) public void OutStock(OutStockRequest outStockRequest)
{ {
var dbOrder = fsql.Select<Order>(outStockRequest.OrderId).ToOne(); var dbOrder = fsql.Select<Order>(outStockRequest.OrderId).ToOne();
@ -653,6 +728,34 @@ namespace BBWY.Server.Business
.ExecuteAffrows(); .ExecuteAffrows();
} }
/// <summary>
/// 修改商家备注
/// </summary>
/// <param name="editVenderRemarkRequest"></param>
public void EditVenderRemark(EditVenderRemarkRequest editVenderRemarkRequest)
{
//修改平台订单备注
var relayAPIHost = GetPlatformRelayAPIHost(editVenderRemarkRequest.Platform);
if (editVenderRemarkRequest.Platform == Enums.Platform.京东)
{
var editApiResult = restApiService.SendRequest(relayAPIHost, "/Api/PlatformSDK/EditVenderRemark", editVenderRemarkRequest, null, HttpMethod.Post);
if (editApiResult.StatusCode != System.Net.HttpStatusCode.OK)
throw new BusinessException($"修改商家备注失败 {editApiResult.Content}") { Code = (int)editApiResult.StatusCode };
var editResponse = JsonConvert.DeserializeObject<ApiResponse>(editApiResult.Content);
if (!editResponse.Success)
throw new BusinessException(editResponse.Msg);
}
else
{
throw new NotImplementedException();
}
fsql.Update<Order>(editVenderRemarkRequest.OrderId).Set(o => o.Flag, editVenderRemarkRequest.Flag)
.Set(o => o.VenderRemark, editVenderRemarkRequest.VenderRemark)
.ExecuteAffrows();
}
/// <summary> /// <summary>
/// 同步订单 /// 同步订单
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save