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

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
d92508aa3e
commit
3536fe09d9
13 changed files with 148 additions and 161 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. 11
      BBWY.Client/APIServices/BatchPurchaseService.cs
  2. 2
      BBWY.Client/BBWYAppSettings.json
  3. 46
      BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
  4. 15
      BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
  5. 195
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  6. 7
      BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
  7. 2
      BBWY.Client/Views/PackTask/LookCerWindow.xaml
  8. 4
      BBWY.Client/Views/PackTask/PrintWindow.xaml
  9. 1
      BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
  10. 10
      BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
  11. 2
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
  12. 2
      BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs
  13. 8
      BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs

11
BBWY.Client/APIServices/BatchPurchaseService.cs
View File

@ -144,13 +144,10 @@ namespace BBWY.Client.APIServices
return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/PayPurchaseOrder", new return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/PayPurchaseOrder", new
{ {
orderId, orderId,
PurchasePlatform, Platform = purchaseAccount.PurchasePlatformId,
purchaseAccount, purchaseAccount.AppKey,
globalContext.User.Shop.ShopId, purchaseAccount.AppSecret,
globalContext.User.Shop.ShopName, purchaseAccount.AppToken,
globalContext.User.Shop.AppKey,
globalContext.User.Shop.AppSecret,
globalContext.User.Shop.AppToken
}, null, HttpMethod.Post); }, null, HttpMethod.Post);
} }

2
BBWY.Client/BBWYAppSettings.json
View File

@ -1,5 +1,5 @@
{ {
//"BBWYApiHost": "http://localhost:5000", // "BBWYApiHost": "http://localhost:5000",
"BBWYApiHost": "http://bbwytest.qiyue666.com", "BBWYApiHost": "http://bbwytest.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "", "JOSApiHost": "",

46
BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
View File

@ -24,33 +24,41 @@ namespace BBWY.Client.Models
{ {
#region 属性 #region 属性
private bool isSelected;
public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
private ObservableCollection<ComboBoxItem> positionTypeList = new ObservableCollection<ComboBoxItem> { private ObservableCollection<string> worryList = new ObservableCollection<string> {
new ComboBoxItem{IsSelected = false,Content = "本地仓"}, new ComboBoxItem{IsSelected = false,Content = "齐越仓"}, new ComboBoxItem{IsSelected = false,Content = "京东仓"} "否","是"
};
public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
"本地仓","齐越仓", "京东仓"};
public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
}; private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
public ObservableCollection<ComboBoxItem> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } } "单件","多件"
private ObservableCollection<ComboBoxItem> packTypeList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="单件",IsSelected=false }, new ComboBoxItem{ Content="多件",IsSelected=false }
}; };
public ObservableCollection<ComboBoxItem> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } } public ObservableCollection<string> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } }
private ObservableCollection<ComboBoxItem> basicPackList = new ObservableCollection<ComboBoxItem> { private ObservableCollection<string> basicPackList = new ObservableCollection<string> {
new ComboBoxItem{ Content="快递袋",IsSelected=false }, new ComboBoxItem{ Content="纸箱",IsSelected=false }, new ComboBoxItem{ Content="麻袋",IsSelected=false } "快递袋","纸箱","麻袋"
}; };
public ObservableCollection<ComboBoxItem> BasicPackList { get => basicPackList; set { Set(ref basicPackList, value); } } public ObservableCollection<string> BasicPackList { get => basicPackList; set { Set(ref basicPackList, value); } }
private ObservableCollection<ComboBoxItem> isNeedBarCodeList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{IsSelected = false,Content = "需要"}, new ComboBoxItem{IsSelected = false,Content = "不需要"}};
public ObservableCollection<ComboBoxItem> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
private ObservableCollection<ComboBoxItem> certificatePositionList = new ObservableCollection<ComboBoxItem> { private ObservableCollection<string> isNeedBarCodeList = new ObservableCollection<string> {
new ComboBoxItem{ Content="无",IsSelected=false }, new ComboBoxItem{ Content="外部包装",IsSelected=false }, new ComboBoxItem{ Content="产品包装",IsSelected=false } "需要", "不需要" };
public ObservableCollection<string> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
"无","外部包装","产品包装"
}; };
public ObservableCollection<ComboBoxItem> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } } public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
private ObservableCollection<ComboBoxItem> availabilityList = new ObservableCollection<ComboBoxItem> {
new ComboBoxItem{ Content="已到货",IsSelected=false }, new ComboBoxItem{ Content="部分到货",IsSelected=false }, new ComboBoxItem{ Content="未到货",IsSelected=false } private ObservableCollection<string> availabilityList = new ObservableCollection<string> {
"已到货","部分到货","未到货"
}; };
public ObservableCollection<ComboBoxItem> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } } public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
private int skuCount; private int skuCount;
/// <summary> /// <summary>

15
BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
View File

@ -139,7 +139,13 @@ namespace BBWY.Client.ViewModels
var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), purchaseAccount, ""); var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), purchaseAccount, "");
if (res.Success) if (res.Success)
{ {
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex)); if (res.Data.Success)
{
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
return;
}
MessageBox.Show(res.Data.Msg);
return; return;
} }
if (res.Data != null) if (res.Data != null)
@ -162,7 +168,12 @@ namespace BBWY.Client.ViewModels
var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount); var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount);
if (res.Success) if (res.Success)
{ {
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex)); if (res.Data.Success)
{
Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
return;
}
MessageBox.Show(res.Data.Msg);
return; return;
} }
if (res.Data != null) if (res.Data != null)

195
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
View File

@ -24,6 +24,9 @@ namespace BBWY.Client.ViewModels.PackTask
public class CreatePackTaskViewModel : BaseVM, IDenpendency public class CreatePackTaskViewModel : BaseVM, IDenpendency
{ {
#region 属性
private bool isSelected;
public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
private bool isLoading = false; private bool isLoading = false;
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
@ -82,12 +85,6 @@ namespace BBWY.Client.ViewModels.PackTask
public string SkuName { get => skuName; set { Set(ref skuName, value); } } public string SkuName { get => skuName; set { Set(ref skuName, value); } }
//private long barCodeId;
///// <summary>
///// 条形码id
///// </summary>
//public long BarCodeId { get => barCodeId; set { Set(ref barCodeId, value); } }
private string brand; private string brand;
/// <summary> /// <summary>
/// 品牌 /// 品牌
@ -131,12 +128,6 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } } public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
private DateTime endTime;
/// <summary>
/// 提交时间
/// </summary>
public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } }
private long taskId; private long taskId;
/// <summary> /// <summary>
@ -173,14 +164,6 @@ namespace BBWY.Client.ViewModels.PackTask
public TaskState Availability { get => availability; set { Set(ref availability, value); } } public TaskState Availability { get => availability; set { Set(ref availability, value); } }
private int taskStatus;
/// <summary>
/// 任务状态（已完成=0，未完成=1）
/// </summary>
public int TaskStatus { get => taskStatus; set { Set(ref taskStatus, value); } }
private PackType packType; private PackType packType;
/// <summary> /// <summary>
/// 打包类型（单件=0，多件=1） /// 打包类型（单件=0，多件=1）
@ -295,7 +278,7 @@ namespace BBWY.Client.ViewModels.PackTask
private string saveTask; private string saveTask;
/// <summary> /// <summary>
/// 设置显示(合格证) /// 发布按钮(发布/保存)
/// </summary> /// </summary>
public string SaveTask { get => saveTask; set { Set(ref saveTask, value); } } public string SaveTask { get => saveTask; set { Set(ref saveTask, value); } }
@ -337,6 +320,8 @@ namespace BBWY.Client.ViewModels.PackTask
/// 注意事项（对接备注） /// 注意事项（对接备注）
/// </summary> /// </summary>
public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } } public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } }
#endregion
@ -491,14 +476,14 @@ namespace BBWY.Client.ViewModels.PackTask
this.globalContext = globalContext; this.globalContext = globalContext;
SetBarCodeCommand = new RelayCommand(SetBarCode); SetBarCodeCommand = new RelayCommand(SetBarCode);
SetCertificateCommand = new RelayCommand(SetCertificate); SetCertificateCommand = new RelayCommand(SetCertificate);
SaveBarCodeCommand = new RelayCommand(SaveBarCode); //SaveBarCodeCommand = new RelayCommand(SaveBarCode);
SetSpuCerCommand = new RelayCommand(SetSpuCer); //SetSpuCerCommand = new RelayCommand(SetSpuCer);
SaveSpuCerCommand = new RelayCommand(SaveSpuCer); //SaveSpuCerCommand = new RelayCommand(SaveSpuCer);
InseartCerCommand = new RelayCommand(InseartCer); //InseartCerCommand = new RelayCommand(InseartCer);
SaveCerCommand = new RelayCommand(SaveCer); //SaveCerCommand = new RelayCommand(SaveCer);
BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck); //BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck); CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck); SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck);
@ -511,84 +496,84 @@ namespace BBWY.Client.ViewModels.PackTask
BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式 BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式
} }
private void InseartCer() //private void InseartCer()
{ //{
if (IsSetSpuCertificate) // if (IsSetSpuCertificate)
{ // {
new TipsWindow("无可用模板").Show(); // new TipsWindow("无可用模板").Show();
return; // return;
} // }
CertificateModel = new CertificateModel() // CertificateModel = new CertificateModel()
{ // {
//SpuId = SpuCertificateModel.SpuId, // //SpuId = SpuCertificateModel.SpuId,
SkuId = SkuId, // SkuId = SkuId,
Brand = SpuCertificateModel.Brand, // Brand = SpuCertificateModel.Brand,
BrandName = SpuCertificateModel.BrandName, // BrandName = SpuCertificateModel.BrandName,
ExcuteStander = SpuCertificateModel.ExcuteStander, // ExcuteStander = SpuCertificateModel.ExcuteStander,
FactoryNumber = SpuCertificateModel.FactoryNumber, // FactoryNumber = SpuCertificateModel.FactoryNumber,
IsLogo = SpuCertificateModel.IsLogo, // IsLogo = SpuCertificateModel.IsLogo,
LabelModel = SpuCertificateModel.LabelModel, // LabelModel = SpuCertificateModel.LabelModel,
ProductAdress = SpuCertificateModel.ProductAdress, // ProductAdress = SpuCertificateModel.ProductAdress,
ProductNo = SpuCertificateModel.ProductNo, // ProductNo = SpuCertificateModel.ProductNo,
Shader = SpuCertificateModel.Shader, // Shader = SpuCertificateModel.Shader,
ProductShop = SpuCertificateModel.ProductShop, // ProductShop = SpuCertificateModel.ProductShop,
ApplyAge = SpuCertificateModel.ApplyAge, // ApplyAge = SpuCertificateModel.ApplyAge,
}; // };
} //}
private void SetSpuCer() //private void SetSpuCer()
{ //{
if (SpuCertificateModel == null) // if (SpuCertificateModel == null)
{ // {
SpuCertificateModel = new CertificateModel(); // SpuCertificateModel = new CertificateModel();
SpuCertificateModel.ProductNo = ProductNo; // SpuCertificateModel.ProductNo = ProductNo;
SpuCertificateModel.Brand = Brand; // SpuCertificateModel.Brand = Brand;
SpuCertificateModel.SkuId = SkuId; // SpuCertificateModel.SkuId = SkuId;
} // }
if (!string.IsNullOrEmpty(BrandName)) // if (!string.IsNullOrEmpty(BrandName))
SpuCertificateModel.BrandName = BrandName; // SpuCertificateModel.BrandName = BrandName;
setSpuCerWindow = new SetSpuCerWindow(); // setSpuCerWindow = new SetSpuCerWindow();
setSpuCerWindow.Show(); // setSpuCerWindow.Show();
} //}
private void SaveSpuCer() //private void SaveSpuCer()
{ //{
if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander) // if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander)
|| string.IsNullOrEmpty(SpuCertificateModel.BrandName) // || string.IsNullOrEmpty(SpuCertificateModel.BrandName)
|| string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop) // || string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop)
|| string.IsNullOrEmpty(SpuCertificateModel.ProductAdress)) // || string.IsNullOrEmpty(SpuCertificateModel.ProductAdress))
{ // {
new TipsWindow("参数出错!请重新填写!").Show(); // new TipsWindow("参数出错!请重新填写!").Show();
return; // return;
} // }
var resData = packTaskService.SaveSpuCer(new CerRequest // var resData = packTaskService.SaveSpuCer(new CerRequest
{ // {
Brand = SpuCertificateModel.Brand, // Brand = SpuCertificateModel.Brand,
BrandName = SpuCertificateModel.BrandName, // BrandName = SpuCertificateModel.BrandName,
ProductNo = SpuCertificateModel.ProductNo, // ProductNo = SpuCertificateModel.ProductNo,
SpuId = SpuCertificateModel.SpuId, // SpuId = SpuCertificateModel.SpuId,
ExcuteStander = SpuCertificateModel.ExcuteStander, // ExcuteStander = SpuCertificateModel.ExcuteStander,
LabelModel = (int)SpuCertificateModel.LabelModel, // LabelModel = (int)SpuCertificateModel.LabelModel,
FactoryNumber = SpuCertificateModel.FactoryNumber, // FactoryNumber = SpuCertificateModel.FactoryNumber,
IsLogo = SpuCertificateModel.IsLogo, // IsLogo = SpuCertificateModel.IsLogo,
ProductAdress = SpuCertificateModel.ProductAdress, // ProductAdress = SpuCertificateModel.ProductAdress,
ProductShop = SpuCertificateModel.ProductShop, // ProductShop = SpuCertificateModel.ProductShop,
Shader = SpuCertificateModel.Shader, // Shader = SpuCertificateModel.Shader,
SkuId = SpuCertificateModel.SkuId, // SkuId = SpuCertificateModel.SkuId,
ApplyAge = SpuCertificateModel.ApplyAge, // ApplyAge = SpuCertificateModel.ApplyAge,
}); // });
if (resData == null || !resData.Success) // if (resData == null || !resData.Success)
{ // {
IsSetSpuCertificate = false; // IsSetSpuCertificate = false;
return; // return;
} // }
IsSetSpuCertificate = false; // IsSetSpuCertificate = false;
setSpuCerWindow.Close(); // setSpuCerWindow.Close();
} //}
private void OnSearchIncreateKeyWordChanged(string key) private void OnSearchIncreateKeyWordChanged(string key)
{ {

7
BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
View File

@ -128,9 +128,8 @@
</ComboBox> </ComboBox>
<TextBlock Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/> <TextBlock Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
<ComboBox VerticalContentAlignment="Center" Text="{Binding IsWorry}" > <ComboBox VerticalContentAlignment="Center" ItemsSource="{Binding WorryList}" Text="{Binding IsWorry}" >
<ComboBoxItem Content="否" IsSelected="True" />
<ComboBoxItem Content="是"/>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
@ -189,7 +188,7 @@
<Grid Grid.Row="1" Grid.Column="0" > <Grid Grid.Row="1" Grid.Column="0" >
<ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding PackTypeList}" Text="{Binding PackType}" > <ComboBox VerticalContentAlignment="Center" Margin="5" ItemsSource="{Binding PackTypeList}" Text="{Binding PackType}" >
</ComboBox> </ComboBox>
</Grid> </Grid>

2
BBWY.Client/Views/PackTask/LookCerWindow.xaml
View File

@ -88,7 +88,7 @@
</Grid> </Grid>
</Border> </Border>
<Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left"> <Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid > <Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />

4
BBWY.Client/Views/PackTask/PrintWindow.xaml
View File

@ -170,7 +170,7 @@
</Grid> </Grid>
</Border> </Border>
<Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left"> <Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid > <Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
@ -229,8 +229,6 @@
Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/> Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Grid> </Grid>

1
BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
View File

@ -37,7 +37,6 @@ namespace BBWY.Client.Views.PackTask
this.IsSetSpuCertificate = IsSetSpuCertificate; this.IsSetSpuCertificate = IsSetSpuCertificate;
SetSpuCer.Content = IsSetSpuCertificate ? "设置spu模板" : "修改spu模板"; SetSpuCer.Content = IsSetSpuCertificate ? "设置spu模板" : "修改spu模板";
this.DataContext = this; this.DataContext = this;
} }
public bool IsSetSpuCertificate { get; set; } public bool IsSetSpuCertificate { get; set; }
public PackTaskService packTaskService { get; set; } public PackTaskService packTaskService { get; set; }

10
BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
View File

@ -23,12 +23,12 @@ namespace BBWY.Server.Business
public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest) public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
{ {
var data = payPurchaseOrderRequest.PurchaseAccount;
var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
{ {
orderId = payPurchaseOrderRequest.OrderId, orderId = payPurchaseOrderRequest.OrderId,
userAccount = data.AccountName userAccount = payPurchaseOrderRequest.AppToken
}, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret); }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState.待发货 }; if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState.待发货 };
if (qtResponse.Message != null && qtResponse.Message.Contains("已支付")) if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
@ -36,8 +36,8 @@ namespace BBWY.Server.Business
var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
{ {
orderId = payPurchaseOrderRequest.OrderId, orderId = payPurchaseOrderRequest.OrderId,
userAccount = data.AccountName userAccount = payPurchaseOrderRequest.AppToken
}, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret); }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
if (res.Status == 200) if (res.Status == 200)
{ {
PurchaseOrderState purchaseOrder= PurchaseOrderState.待发货; PurchaseOrderState purchaseOrder= PurchaseOrderState.待发货;

2
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
View File

@ -441,7 +441,7 @@ namespace BBWY.Server.Business
public PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest request) public PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest request)
{ {
var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.PurchasePlatform); var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
var payOrderResponse = platformSDKBusiness.PayPurchaseOrder(request); var payOrderResponse = platformSDKBusiness.PayPurchaseOrder(request);
if (payOrderResponse.Success) if (payOrderResponse.Success)

2
BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs
View File

@ -3,8 +3,6 @@
public class CancelPurchaseOrderRequest: PlatformRequest public class CancelPurchaseOrderRequest: PlatformRequest
{ {
public string OrderId { get; set; } public string OrderId { get; set; }
public string Remark { get; set; } public string Remark { get; set; }
} }
} }

8
BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs
View File

@ -8,13 +8,5 @@ namespace BBWY.Server.Model.Dto
public class PayPurchaseOrderRequest : PlatformRequest public class PayPurchaseOrderRequest : PlatformRequest
{ {
public string OrderId { get; set; } public string OrderId { get; set; }
public PurchaseAccount PurchaseAccount { get; set; }
/// <summary>
/// 采购平台
/// </summary>
public Enums.Platform PurchasePlatform { get; set; }
} }
} }

Write Preview
Loading…
Cancel
Save