Browse Source

编辑

qianyi
shanji 2 years ago
parent
commit
0b9c80a4a1
  1. 25
      BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs
  2. 66
      BBWY.Client/ViewModels/ServiceOrder/EditServiceOrderViewModel.cs
  3. 14
      BBWY.Client/ViewModels/ServiceOrder/ServiceOrderViewModel.cs
  4. 163
      BBWY.Client/Views/ServiceOrder/EditServiceOrder.xaml
  5. 9
      BBWY.Client/Views/ServiceOrder/EditServiceOrder.xaml.cs
  6. 22
      BBWY.Client/Views/ServiceOrder/ServiceOrderList.xaml
  7. 3
      BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs
  8. 2
      BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
  9. 30
      BBWY.Server.Model/Db/Order/Serviceorder.cs
  10. 25
      BBWY.Server.Model/Dto/Response/ServiceOrder/ServiceOrderItemResponse.cs
  11. 57
      BBWY.Test/Program.cs
  12. 7
      JD.API/Controllers/PlatformSDKController.cs
  13. 2
      JD.API/appsettings.json

25
BBWY.Client/Models/APIModel/Response/ServiceOrder/ServiceOrderItemResponse.cs

@ -238,6 +238,31 @@ namespace BBWY.Client.Models
/// </summary>
public DateTime? QualityInspectionInStoreTime { get; set; }
/// <summary>
/// 换新单号
/// </summary>
public string RenewalOrderId { get; set; }
/// <summary>
/// 退货检查备注
/// </summary>
public string ReturnCheckRemark { get; set; }
/// <summary>
/// 线下换新方式
/// </summary>
public StorageType? RenewalType { get; set; }
/// <summary>
/// 线下换新采购单号
/// </summary>
public string RenewalPurchaseOrderId { get; set; }
/// <summary>
/// 线下换新采购平台
/// </summary>
public Platform? RenewalPurchasePlatform { get; set; }
#region Sku
public string Logo { get; set; }

66
BBWY.Client/ViewModels/ServiceOrder/EditServiceOrderViewModel.cs

@ -1,17 +1,79 @@
using BBWY.Client.Models;
using GalaSoft.MvvmLight.Command;
using System.Windows.Input;
namespace BBWY.Client.ViewModels
{
public class EditServiceOrderViewModel: BaseVM
public class EditServiceOrderViewModel : BaseVM
{
/// <summary>
/// 主键Id
/// </summary>
private long servicePId;
private ServiceResult? serviceResult;
private decimal? sdRefundFreight;
private ReturnDirection? returnDirection;
private string renewalOrderId;
private decimal? reissueAfterSaleAmount;
private string returnCheckRemark;
private StorageType? renewalType;
private string renewalPurchaseOrderId;
private Platform? renewalPurchasePlatform;
private decimal? reissueFreight;
private decimal? reissueProductAmount;
public ServiceResult? ServiceResult { get => serviceResult; set { Set(ref serviceResult, value); } }
public decimal? SDRefundFreight { get => sdRefundFreight; set { Set(ref sdRefundFreight, value); } }
public ReturnDirection? ReturnDirection { get => returnDirection; set { Set(ref returnDirection, value); } }
public string RenewalOrderId { get => renewalOrderId; set { Set(ref renewalOrderId, value); } }
/// <summary>
/// 售后补发成本
/// </summary>
public decimal? ReissueAfterSaleAmount { get => reissueAfterSaleAmount; set { Set(ref reissueAfterSaleAmount, value); } }
/// <summary>
/// 退货检查备注
/// </summary>
public string ReturnCheckRemark { get => returnCheckRemark; set { Set(ref returnCheckRemark, value); } }
public StorageType? RenewalType { get => renewalType; set { Set(ref renewalType, value); } }
public string RenewalPurchaseOrderId { get => renewalPurchaseOrderId; set { Set(ref renewalPurchaseOrderId, value); } }
public Platform? RenewalPurchasePlatform { get => renewalPurchasePlatform; set { Set(ref renewalPurchasePlatform, value); } }
public ICommand SaveCommand { get; set; }
public decimal? ReissueFreight { get => reissueFreight; set { Set(ref reissueFreight, value); } }
public decimal? ReissueProductAmount { get => reissueProductAmount; set { Set(ref reissueProductAmount, value); } }
public EditServiceOrderViewModel()
{
SaveCommand = new RelayCommand(Save);
}
public void SetData(ServiceOrder serviceOrder)
{
this.servicePId = serviceOrder.Id;
this.ServiceResult = serviceOrder.ServiceResult;
this.SDRefundFreight = serviceOrder.SDRefundFreight;
this.ReturnDirection = serviceOrder.ReturnDirection;
this.RenewalOrderId = serviceOrder.RenewalOrderId;
this.ReissueAfterSaleAmount = serviceOrder.ReissueAfterSaleAmount;
this.ReturnCheckRemark = serviceOrder.ReturnCheckRemark;
this.RenewalType = serviceOrder.RenewalType;
this.RenewalPurchaseOrderId = serviceOrder.RenewalPurchaseOrderId;
this.RenewalPurchasePlatform = serviceOrder.RenewalPurchasePlatform;
this.ReissueFreight = serviceOrder.ReissueFreight;
this.ReissueProductAmount = serviceOrder.ReissueProductAmount;
}
private void Save()
{
//closeEditServiceOrder
GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(true, "closeEditServiceOrder");
}
}
}

14
BBWY.Client/ViewModels/ServiceOrder/ServiceOrderViewModel.cs

@ -1,6 +1,7 @@
using BBWY.Client.APIServices;
using BBWY.Client.Helpers;
using BBWY.Client.Models;
using BBWY.Client.Views.ServiceOrder;
using BBWY.Common.Extensions;
using BBWY.Common.Http;
using BBWY.Common.Models;
@ -57,6 +58,8 @@ namespace BBWY.Client.ViewModels
public ICommand PreviewImgCommand { get; set; }
public ICommand EditServiceOrderCommand { get; set; }
public IList<ServiceOrder> ServiceOrderList { get; set; }
public long ServiceOrderCount { get => serviceOrderCount; set { Set(ref serviceOrderCount, value); } }
@ -91,6 +94,7 @@ namespace BBWY.Client.ViewModels
NavigateToDetailCommand = new RelayCommand<string>(NavigateToDetail);
OnPageIndexChangedCommand = new RelayCommand<PageArgs>(OnPageIndexChanged);
PreviewImgCommand = new RelayCommand<string>(PreviewImg);
EditServiceOrderCommand = new RelayCommand<ServiceOrder>(OpenEditServiceOrder);
ServiceOrderList = new ObservableCollection<ServiceOrder>() { new ServiceOrder(), new ServiceOrder(), new ServiceOrder() };
PageSize = 10;
GlobalContext = globalContext;
@ -241,5 +245,15 @@ namespace BBWY.Client.ViewModels
App.Current.Dispatcher.Invoke(() => MessageBox.Show($"打开照片查看器失败 {ex.Message}"));
}
}
private void OpenEditServiceOrder(ServiceOrder serviceOrder)
{
var w = new EditServiceOrder(serviceOrder);
var r = w.ShowDialog();
if (r == true)
{
//Refresh ServiceOrder
}
}
}
}

163
BBWY.Client/Views/ServiceOrder/EditServiceOrder.xaml

@ -5,12 +5,175 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BBWY.Client.Views.ServiceOrder"
mc:Ignorable="d"
xmlns:clientModel="clr-namespace:BBWY.Client.Models"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
Style="{StaticResource bwstyle}"
DataContext="{Binding EditServiceOrder,Source={StaticResource Locator}}"
Title="EditServiceOrder" Height="450" Width="340">
<c:BWindow.Resources>
<ObjectDataProvider x:Key="serviceResultProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="clientModel:ServiceResult"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ObjectDataProvider x:Key="returnDirectionProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="clientModel:ReturnDirection"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="clientModel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ObjectDataProvider x:Key="platformProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="clientModel:Platform"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
</c:BWindow.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
<RowDefinition/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}">
<TextBlock Text="售后信息" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<StackPanel Grid.Row="1" Margin="5">
<Grid Height="25">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="处理结果:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<ComboBox ItemsSource="{Binding Source={StaticResource serviceResultProvider}}"
SelectedItem="{Binding ServiceResult,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Width="160"
Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=换新|线下换新|退货:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="退货去向:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<ComboBox ItemsSource="{Binding Source={StaticResource returnDirectionProvider}}"
SelectedItem="{Binding ReturnDirection,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Width="160"
Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=SD退货:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="SD退货运费:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding SDRefundFreight}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=换新:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="换新单号:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding RenewalOrderId}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=换新|线下换新|退货|商品补发|原返|仅退款:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="售后补偿:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding ReissueAfterSaleAmount}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="换新方式:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<ComboBox ItemsSource="{Binding Source={StaticResource storageTypeProvider}}"
SelectedItem="{Binding RenewalType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
Width="160"
Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=线下换新:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
<ColumnDefinition Width="80"/>
</Grid.ColumnDefinitions>
<TextBlock Text="采购单号:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding RenewalPurchaseOrderId}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
<ComboBox ItemsSource="{Binding Source={StaticResource platformProvider}}"
SelectedItem="{Binding RenewalPurchasePlatform,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Grid.Column="2"
HorizontalAlignment="Left"
VerticalContentAlignment="Center"
MinWidth="70"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=商品补发:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="补发快递费:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding ReissueFreight}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
</Grid>
<Grid Height="25" Margin="0,5,0,0"
Visibility="{Binding ServiceResult,ConverterParameter=商品补发:Visible:Collapsed,Converter={StaticResource objConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="补发货款成本:" VerticalAlignment="Center" HorizontalAlignment="Right"/>
<c:BTextBox Text="{Binding ReissueProductAmount}" Width="160" Grid.Column="1" HorizontalAlignment="Left"
Height="25" Margin="5,0,0,0"/>
</Grid>
</StackPanel>
<Grid Grid.Row="2" Margin="5,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="退货检查备注:" Margin="0,3"/>
<TextBox Grid.Row="1" AcceptsReturn="True"
TextWrapping="Wrap" Padding="3"
Text="{Binding ReturnCheckRemark}"/>
</Grid>
<c:BButton Content="保存" Width="80" HorizontalAlignment="Right" Grid.Row="3"
Command="{Binding SaveCommand}" Margin="0,0,5,0"/>
</Grid>
</c:BWindow>

9
BBWY.Client/Views/ServiceOrder/EditServiceOrder.xaml.cs

@ -1,6 +1,5 @@
using BBWY.Client.ViewModels;
using BBWY.Controls;
using System.Windows;
namespace BBWY.Client.Views.ServiceOrder
{
@ -13,6 +12,14 @@ namespace BBWY.Client.Views.ServiceOrder
{
InitializeComponent();
(this.DataContext as EditServiceOrderViewModel).SetData(serviceOrder);
GalaSoft.MvvmLight.Messaging.Messenger.Default.Register<bool>(this, "closeEditServiceOrder", (r) =>
{
if (r)
{
this.DialogResult = true;
this.Close();
}
});
}
}
}

22
BBWY.Client/Views/ServiceOrder/ServiceOrderList.xaml

@ -316,12 +316,12 @@
Background="Transparent"
Foreground="{StaticResource Text.Color}"
Grid.Column="1"
Command="{Binding DataContext.EditAfterSaleOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
Command="{Binding DataContext.EditServiceOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding }"/>
<Border Grid.Column="1" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<TextBlock Text="{Binding WareHouseGrounpRemark}" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"
<TextBlock Text="{Binding ReturnCheckRemark}" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center"
TextWrapping="Wrap"/>
<Border Grid.Column="2" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -397,22 +397,22 @@
<Border Grid.Column="3" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Grid.Column="4" VerticalAlignment="Center" Margin="5,0,0,0"
Visibility="{Binding PurchaseOrderId,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}">
Visibility="{Binding RenewalPurchaseOrderId,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}">
<TextBlock>
<Run Text="采购平台:"/>
<Run Text="{Binding PurchasePlatform}"/>
<Run Text="{Binding RenewalPurchasePlatform}"/>
</TextBlock>
<StackPanel Orientation="Horizontal">
<TextBlock Text="采购订单号:"/>
<c:BButton Content="{Binding PurchaseOrderId}" Style="{StaticResource LinkButton}"
<c:BButton Content="{Binding RenewalPurchaseOrderId}" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding PurchaseOrderId}" Margin="3,0,0,0"/>
CommandParameter="{Binding RenewalPurchaseOrderId}" Margin="3,0,0,0"/>
</StackPanel>
</StackPanel>
<Border Grid.Column="4" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Orientation="Horizontal" Grid.Column="5" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,20">
<TextBlock>
<Run Text="总耗损"/>
<Run Text="{Binding AfterTotalCost}"/>
@ -421,6 +421,14 @@
</Path>
</StackPanel>
<Border Height="1" Background="{StaticResource Border.Brush}" Grid.Column="5" VerticalAlignment="Bottom" Margin="0,0,0,27"/>
<c:BButton Content="设置" VerticalAlignment="Bottom"
HorizontalAlignment="Stretch"
Background="Transparent"
Foreground="{StaticResource Text.Color}"
Grid.Column="5"
Command="{Binding DataContext.EditServiceOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding }"/>
<Border Grid.Column="5" Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>

3
BBWY.Server.Business/AfterSaleOrder/AfterSaleOrderBusiness.cs

@ -152,7 +152,8 @@ namespace BBWY.Server.Business
if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult. ||
dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult. ||
dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.线)
{ if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.)
{
if (dbAfterSaleOrder.ServiceResult == Model.Enums.ServiceResult.)
dbAfterSaleOrder.ProductHealth = Model.Enums.ProductHealth.退;
dbAfterSaleOrder.ReissueProductAmount = editAfterSaleOrderRequest.ReissueProductAmount;

2
BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs

@ -50,6 +50,8 @@ namespace BBWY.Server.Business
Status = s.Status,
ServiceId = s.ServiceId,
ShopId = s.ShopId,
RenewalOrderId = s.RenewalOrderId,
ReturnCheckRemark = s.ReturnCheckRemark,
Title = osku.Title,
ItemTotal = osku.ItemTotal.Value,

30
BBWY.Server.Model/Db/Order/Serviceorder.cs

@ -283,6 +283,36 @@ namespace BBWY.Server.Model.Db
/// </summary>
[Column(DbType = "datetime")]
public DateTime? QualityInspectionInStoreTime { get; set; }
/// <summary>
/// 换新单号
/// </summary>
[Column(StringLength = 100)]
public string RenewalOrderId { get; set; }
/// <summary>
/// 退货检查备注
/// </summary>
[Column(StringLength = 255)]
public string ReturnCheckRemark { get; set; }
/// <summary>
/// 线下换新方式
/// </summary>
[Column(MapType = typeof(int?))]
public Enums.StorageType? RenewalType { get; set; }
/// <summary>
/// 线下换新采购单号
/// </summary>
[Column(StringLength = 50)]
public string RenewalPurchaseOrderId { get; set; }
/// <summary>
/// 线下换新采购平台
/// </summary>
[Column(MapType = typeof(int?))]
public Enums.Platform? RenewalPurchasePlatform { get; set; }
}
}

25
BBWY.Server.Model/Dto/Response/ServiceOrder/ServiceOrderItemResponse.cs

@ -238,6 +238,31 @@ namespace BBWY.Server.Model.Dto
/// </summary>
public DateTime? QualityInspectionInStoreTime { get; set; }
/// <summary>
/// 换新单号
/// </summary>
public string RenewalOrderId { get; set; }
/// <summary>
/// 退货检查备注
/// </summary>
public string ReturnCheckRemark { get; set; }
/// <summary>
/// 线下换新方式
/// </summary>
public Enums.StorageType? RenewalType { get; set; }
/// <summary>
/// 线下换新采购单号
/// </summary>
public string RenewalPurchaseOrderId { get; set; }
/// <summary>
/// 线下换新采购平台
/// </summary>
public Enums.Platform? RenewalPurchasePlatform { get; set; }
#region Sku
public string Logo { get; set; }

57
BBWY.Test/Program.cs

@ -60,64 +60,7 @@ namespace BBWY.Test
var jdClient = GetJdClient(appkey, appSecret);
//var req = new AdsIbgUniversalJosServiceAdQueryRequest();
//req.accessPin = "可比玩具";
//req.businessType = "2";
//req.isDaily = "true";
//req.clickOrOrderDay = "0";
//req.pageSize = "100";
//req.page = "1";
//req.clickOrOrderCaliber = "1";
//req.startDay = "2023-03-10";
//req.endDay = "2023-03-10";
//req.giftFlag = "0";
//req.orderStatusCategory = "1";
//var res = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
/*
var req = new AscSyncListRequest();
req.buId = "10598776";
req.operatePin = "开发者测试";
req.operateNick = "开发者测试";
//req.serviceId = 1687549909;
//req.orderId = ;
//req.serviceStatus = ;
req.updateTimeBegin = DateTime.Parse("2023-03-01");
req.updateTimeEnd = DateTime.Now;
//req.freightUpdateDateBegin = ;
//req.freightUpdateDateEnd = ;
req.pageNumber = "1";
req.pageSize = "100";
var res = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
*/
//var req = new AscQueryViewRequest();
//req.buId = "10598776";
//req.operatePin = "开发测试";
//req.operateNick = "开发测试";
//req.serviceId = 1688379598;
//req.orderId = 262837096353;
//var res = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
////var res = jdClient.Execute(req, token, DateTime.Now.ToLocalTime());
//Console.WriteLine(JsonConvert.SerializeObject(res));
var tdeClient = new TDEClient("https://api.jd.com/routerjson", appkey, appSecret, token);
var returnWareAddress = "AATLKmlcVOJfnbZ2x4ekuBoGLTpp/eAJf9RDWWhUXsW4hRWT22+CAAuo7e08va+2KKQxGosPRWQ5t56PDp060VetknlcczPyKlymVNCdNRH2ew==";
var pickwareAddress = "AATLKmlcVOJfnbZ2x4ekuBoGSURp5cw04y0gSLeBBy/BLvilFS91R6ASk3Ft2GokuD4YtgjX4hQC8XwsEschrw9DBJQWaFUaacMYA/GyHhlpkw==";
Console.WriteLine($"returnWareAddress {tdeClient.DecryptString(returnWareAddress)}");
Console.WriteLine($"pickwareAddress {tdeClient.DecryptString(pickwareAddress)}");
Console.ReadKey();
}

7
JD.API/Controllers/PlatformSDKController.cs

@ -288,6 +288,7 @@ namespace JD.API.API.Controllers
return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).StartJDPromotionTask(request);
}
[HttpPost]
public void StartJDPromotionDelayTask([FromBody] StartPromotionTaskDelayRequest request)
{
platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).StartJDPromotionDelayTask(request);
@ -340,7 +341,7 @@ namespace JD.API.API.Controllers
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public JArray GetServiceOrderList([FromBody] ClientQueryServiceOrderRequest request)
public JArray GetServiceOrderList([FromBody] QueryServiceOrderRequest request)
{
return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetServiceOrderList(request);
}
@ -351,7 +352,7 @@ namespace JD.API.API.Controllers
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public JToken GetServiceOrderDetail(QueryServiceOrderDetailRequest request)
public JToken GetServiceOrderDetail([FromBody] QueryServiceOrderDetailRequest request)
{
return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetServiceOrderDetail(request);
}
@ -362,7 +363,7 @@ namespace JD.API.API.Controllers
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
public JToken GetServiceOrderDeliveryDetail(QueryServiceOrderDetailRequest request)
public JToken GetServiceOrderDeliveryDetail([FromBody] QueryServiceOrderDetailRequest request)
{
return platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform).GetServiceOrderDeliveryDetail(request);
}

2
JD.API/appsettings.json

@ -9,7 +9,7 @@
"ConnectionStrings": {
"DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy_test;charset=utf8;sslmode=none;",
},
"IsEnableSwagger": false,
"IsEnableSwagger": true,
"AllowedHosts": "*",
"ValidatePlatformKey": 1
}

Loading…
Cancel
Save