1

2 years ago · 3536fe09d9
13 changed files with 148 additions and 161 deletions
--- a/BBWY.Client/APIServices/BatchPurchaseService.cs
+++ b/BBWY.Client/APIServices/BatchPurchaseService.cs
@ -144,13 +144,10 @@ namespace BBWY.Client.APIServices
            return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/PayPurchaseOrder", new
            {
                orderId,
-                PurchasePlatform,
-                purchaseAccount,
-                globalContext.User.Shop.ShopId,
-                globalContext.User.Shop.ShopName,
-                globalContext.User.Shop.AppKey,
-                globalContext.User.Shop.AppSecret,
-                globalContext.User.Shop.AppToken
+                Platform = purchaseAccount.PurchasePlatformId,
+                purchaseAccount.AppKey,
+                purchaseAccount.AppSecret,
+                purchaseAccount.AppToken,
            }, null, HttpMethod.Post);
        }

--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@ -1,5 +1,5 @@
 {
-  //"BBWYApiHost": "http://localhost:5000",
+  // "BBWYApiHost": "http://localhost:5000",
  "BBWYApiHost": "http://bbwytest.qiyue666.com",
  "MDSApiHost": "http://mdsapi.qiyue666.com",
  "JOSApiHost": "",
--- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
+++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
@ -24,33 +24,41 @@ namespace BBWY.Client.Models
    {

        #region 属性
+        private bool isSelected;
+        public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }

-        private ObservableCollection<ComboBoxItem> positionTypeList = new ObservableCollection<ComboBoxItem> {
-        new ComboBoxItem{IsSelected = false,Content = "本地仓"}, new ComboBoxItem{IsSelected = false,Content = "齐越仓"}, new ComboBoxItem{IsSelected = false,Content = "京东仓"}
-
-        };
-        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 }
+        private ObservableCollection<string> worryList = new ObservableCollection<string> {
+               "否","是"
             };
-        public ObservableCollection<ComboBoxItem> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } }
-
-        private ObservableCollection<ComboBoxItem> basicPackList = new ObservableCollection<ComboBoxItem> {
-                new ComboBoxItem{ Content="快递袋",IsSelected=false }, new ComboBoxItem{ Content="纸箱",IsSelected=false }, new ComboBoxItem{ Content="麻袋",IsSelected=false }
+        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> 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); } }
+        public ObservableCollection<string> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } }

-        private ObservableCollection<ComboBoxItem> certificatePositionList = new ObservableCollection<ComboBoxItem> {
-                 new ComboBoxItem{ Content="无",IsSelected=false }, new ComboBoxItem{ Content="外部包装",IsSelected=false }, new ComboBoxItem{ Content="产品包装",IsSelected=false }
+        private ObservableCollection<string> basicPackList = new ObservableCollection<string> {
+               "快递袋","纸箱","麻袋"
+             };
+        public ObservableCollection<string> BasicPackList { get => basicPackList; set { Set(ref basicPackList, value); } }
+       
+        private ObservableCollection<string> isNeedBarCodeList = new ObservableCollection<string> {
+        "需要", "不需要" };
+        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); } }
-        private ObservableCollection<ComboBoxItem> availabilityList = new ObservableCollection<ComboBoxItem> {
-                new ComboBoxItem{ Content="已到货",IsSelected=false }, new ComboBoxItem{ Content="部分到货",IsSelected=false }, new ComboBoxItem{ Content="未到货",IsSelected=false }
+        public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
+       
+        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;
        /// <summary>
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
@ -139,7 +139,13 @@ namespace BBWY.Client.ViewModels
            var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), purchaseAccount, "");
            if (res.Success)
            {
-                Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+                if (res.Data.Success)
+                {
+                    Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+                    return;
+                }
+
+                MessageBox.Show(res.Data.Msg);
                return;
            }
            if (res.Data != null)
@ -162,7 +168,12 @@ namespace BBWY.Client.ViewModels
            var res = batchPurchaseService.PayOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount);
            if (res.Success)
            {
-                Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+                if (res.Data.Success)
+                {
+                    Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+                    return;
+                }
+                MessageBox.Show(res.Data.Msg);
                return;
            }
            if (res.Data != null)
--- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
@ -24,6 +24,9 @@ namespace BBWY.Client.ViewModels.PackTask
    public class CreatePackTaskViewModel : BaseVM, IDenpendency
    {

+        #region 属性
+        private bool isSelected;
+        public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }

        private bool isLoading = false;
        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); } }


-        //private long barCodeId;
-        ///// <summary>
-        ///// 条形码id
-        ///// </summary>
-        //public long BarCodeId { get => barCodeId; set { Set(ref barCodeId, value); } }
-
        private string brand;
        /// <summary>
        /// 品牌
@ -131,12 +128,6 @@ namespace BBWY.Client.ViewModels.PackTask
        /// </summary>
        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;
        /// <summary>
@ -173,14 +164,6 @@ namespace BBWY.Client.ViewModels.PackTask
        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;
        /// <summary>
        /// 打包类型（单件=0，多件=1）
@ -295,7 +278,7 @@ namespace BBWY.Client.ViewModels.PackTask
        private string saveTask;

        /// <summary>
-        /// 设置显示(合格证)
+        /// 发布按钮(发布/保存)
        /// </summary>
        public string SaveTask { get => saveTask; set { Set(ref saveTask, value); } }

@ -337,6 +320,8 @@ namespace BBWY.Client.ViewModels.PackTask
        /// 注意事项（对接备注）
        /// </summary>
        public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } }
+        #endregion
+



@ -491,14 +476,14 @@ namespace BBWY.Client.ViewModels.PackTask
            this.globalContext = globalContext;
            SetBarCodeCommand = new RelayCommand(SetBarCode);
            SetCertificateCommand = new RelayCommand(SetCertificate);
-            SaveBarCodeCommand = new RelayCommand(SaveBarCode);
+            //SaveBarCodeCommand = new RelayCommand(SaveBarCode);

-            SetSpuCerCommand = new RelayCommand(SetSpuCer);
-            SaveSpuCerCommand = new RelayCommand(SaveSpuCer);
-            InseartCerCommand = new RelayCommand(InseartCer);
+            //SetSpuCerCommand = new RelayCommand(SetSpuCer);
+            //SaveSpuCerCommand = new RelayCommand(SaveSpuCer);
+            //InseartCerCommand = new RelayCommand(InseartCer);

-            SaveCerCommand = new RelayCommand(SaveCer);
-            BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
+            //SaveCerCommand = new RelayCommand(SaveCer);
+            //BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck);
            CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
            SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck);

@ -511,84 +496,84 @@ namespace BBWY.Client.ViewModels.PackTask
            BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式         
        }

-        private void InseartCer()
-        {
-            if (IsSetSpuCertificate)
-            {
-                new TipsWindow("无可用模板").Show();
-                return;
-            }
-            CertificateModel = new CertificateModel()
-            {
-                //SpuId = SpuCertificateModel.SpuId,
-                SkuId = SkuId,
-                Brand = SpuCertificateModel.Brand,
-                BrandName = SpuCertificateModel.BrandName,
-                ExcuteStander = SpuCertificateModel.ExcuteStander,
-                FactoryNumber = SpuCertificateModel.FactoryNumber,
-                IsLogo = SpuCertificateModel.IsLogo,
-                LabelModel = SpuCertificateModel.LabelModel,
-                ProductAdress = SpuCertificateModel.ProductAdress,
-                ProductNo = SpuCertificateModel.ProductNo,
-                Shader = SpuCertificateModel.Shader,
-                ProductShop = SpuCertificateModel.ProductShop,
-                ApplyAge = SpuCertificateModel.ApplyAge,
-            };
-        }
-
-        private void SetSpuCer()
-        {
-
-            if (SpuCertificateModel == null)
-            {
-                SpuCertificateModel = new CertificateModel();
-                SpuCertificateModel.ProductNo = ProductNo;
-                SpuCertificateModel.Brand = Brand;
-                SpuCertificateModel.SkuId = SkuId;
-            }
-            if (!string.IsNullOrEmpty(BrandName))
-                SpuCertificateModel.BrandName = BrandName;
-            setSpuCerWindow = new SetSpuCerWindow();
-            setSpuCerWindow.Show();
-        }
-
-        private void SaveSpuCer()
-        {
-            if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander)
-                || string.IsNullOrEmpty(SpuCertificateModel.BrandName)
-                || string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop)
-                || string.IsNullOrEmpty(SpuCertificateModel.ProductAdress))
-            {
-                new TipsWindow("参数出错!请重新填写!").Show();
-                return;
-            }
-            var resData = packTaskService.SaveSpuCer(new CerRequest
-            {
-                Brand = SpuCertificateModel.Brand,
-                BrandName = SpuCertificateModel.BrandName,
-                ProductNo = SpuCertificateModel.ProductNo,
-                SpuId = SpuCertificateModel.SpuId,
-                ExcuteStander = SpuCertificateModel.ExcuteStander,
-                LabelModel = (int)SpuCertificateModel.LabelModel,
-                FactoryNumber = SpuCertificateModel.FactoryNumber,
-                IsLogo = SpuCertificateModel.IsLogo,
-                ProductAdress = SpuCertificateModel.ProductAdress,
-                ProductShop = SpuCertificateModel.ProductShop,
-                Shader = SpuCertificateModel.Shader,
-                SkuId = SpuCertificateModel.SkuId,
-                ApplyAge = SpuCertificateModel.ApplyAge,
-
-
-
-            });
-            if (resData == null || !resData.Success)
-            {
-                IsSetSpuCertificate = false;
-                return;
-            }
-            IsSetSpuCertificate = false;
-            setSpuCerWindow.Close();
-        }
+        //private void InseartCer()
+        //{
+        //    if (IsSetSpuCertificate)
+        //    {
+        //        new TipsWindow("无可用模板").Show();
+        //        return;
+        //    }
+        //    CertificateModel = new CertificateModel()
+        //    {
+        //        //SpuId = SpuCertificateModel.SpuId,
+        //        SkuId = SkuId,
+        //        Brand = SpuCertificateModel.Brand,
+        //        BrandName = SpuCertificateModel.BrandName,
+        //        ExcuteStander = SpuCertificateModel.ExcuteStander,
+        //        FactoryNumber = SpuCertificateModel.FactoryNumber,
+        //        IsLogo = SpuCertificateModel.IsLogo,
+        //        LabelModel = SpuCertificateModel.LabelModel,
+        //        ProductAdress = SpuCertificateModel.ProductAdress,
+        //        ProductNo = SpuCertificateModel.ProductNo,
+        //        Shader = SpuCertificateModel.Shader,
+        //        ProductShop = SpuCertificateModel.ProductShop,
+        //        ApplyAge = SpuCertificateModel.ApplyAge,
+        //    };
+        //}
+
+        //private void SetSpuCer()
+        //{
+
+        //    if (SpuCertificateModel == null)
+        //    {
+        //        SpuCertificateModel = new CertificateModel();
+        //        SpuCertificateModel.ProductNo = ProductNo;
+        //        SpuCertificateModel.Brand = Brand;
+        //        SpuCertificateModel.SkuId = SkuId;
+        //    }
+        //    if (!string.IsNullOrEmpty(BrandName))
+        //        SpuCertificateModel.BrandName = BrandName;
+        //    setSpuCerWindow = new SetSpuCerWindow();
+        //    setSpuCerWindow.Show();
+        //}
+
+        //private void SaveSpuCer()
+        //{
+        //    if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander)
+        //        || string.IsNullOrEmpty(SpuCertificateModel.BrandName)
+        //        || string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop)
+        //        || string.IsNullOrEmpty(SpuCertificateModel.ProductAdress))
+        //    {
+        //        new TipsWindow("参数出错!请重新填写!").Show();
+        //        return;
+        //    }
+        //    var resData = packTaskService.SaveSpuCer(new CerRequest
+        //    {
+        //        Brand = SpuCertificateModel.Brand,
+        //        BrandName = SpuCertificateModel.BrandName,
+        //        ProductNo = SpuCertificateModel.ProductNo,
+        //        SpuId = SpuCertificateModel.SpuId,
+        //        ExcuteStander = SpuCertificateModel.ExcuteStander,
+        //        LabelModel = (int)SpuCertificateModel.LabelModel,
+        //        FactoryNumber = SpuCertificateModel.FactoryNumber,
+        //        IsLogo = SpuCertificateModel.IsLogo,
+        //        ProductAdress = SpuCertificateModel.ProductAdress,
+        //        ProductShop = SpuCertificateModel.ProductShop,
+        //        Shader = SpuCertificateModel.Shader,
+        //        SkuId = SpuCertificateModel.SkuId,
+        //        ApplyAge = SpuCertificateModel.ApplyAge,
+
+
+
+        //    });
+        //    if (resData == null || !resData.Success)
+        //    {
+        //        IsSetSpuCertificate = false;
+        //        return;
+        //    }
+        //    IsSetSpuCertificate = false;
+        //    setSpuCerWindow.Close();
+        //}

        private void OnSearchIncreateKeyWordChanged(string key)
        {
--- a/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
@ -128,9 +128,8 @@
                                     
                                    </ComboBox>
                                    <TextBlock  Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
-                                    <ComboBox VerticalContentAlignment="Center"   Text="{Binding IsWorry}"   >
-                                        <ComboBoxItem Content="否" IsSelected="True" />
-                                        <ComboBoxItem Content="是"/>
+                                    <ComboBox  VerticalContentAlignment="Center"  ItemsSource="{Binding WorryList}"  Text="{Binding IsWorry}"   >
+                                       
                                    </ComboBox>
                                </StackPanel>

@ -189,7 +188,7 @@


                                    <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>
                                    </Grid>
--- a/BBWY.Client/Views/PackTask/LookCerWindow.xaml
+++ b/BBWY.Client/Views/PackTask/LookCerWindow.xaml
@ -88,7 +88,7 @@

                </Grid>
            </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 >
                    <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
                    <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
--- a/BBWY.Client/Views/PackTask/PrintWindow.xaml
+++ b/BBWY.Client/Views/PackTask/PrintWindow.xaml
@ -170,7 +170,7 @@

                    </Grid>
                </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 >
                        <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
                        <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"/>
                    </Grid>
                </Border>
-              
-
            </Grid>

        </Grid>
--- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
@ -37,7 +37,6 @@ namespace BBWY.Client.Views.PackTask
            this.IsSetSpuCertificate = IsSetSpuCertificate;
            SetSpuCer.Content = IsSetSpuCertificate ? "设置spu模板" : "修改spu模板";
            this.DataContext = this;
-
        }
        public bool IsSetSpuCertificate { get; set; }
        public PackTaskService packTaskService { get; set; }
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@ -23,12 +23,12 @@ namespace BBWY.Server.Business

        public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
        {
-            var data = payPurchaseOrderRequest.PurchaseAccount;
+            
            var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
            {
                orderId = payPurchaseOrderRequest.OrderId,
-                userAccount = data.AccountName
-            }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
+                userAccount = payPurchaseOrderRequest.AppToken
+            }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
            if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState= PurchaseOrderState.待发货 };

            if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
@ -36,8 +36,8 @@ namespace BBWY.Server.Business
                var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
                {
                    orderId = payPurchaseOrderRequest.OrderId,
-                    userAccount = data.AccountName
-                }, payPurchaseOrderRequest.PurchaseAccount.AppKey, payPurchaseOrderRequest.PurchaseAccount.AppSecret);
+                    userAccount = payPurchaseOrderRequest.AppToken
+                }, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
                if (res.Status == 200)
                {
                    PurchaseOrderState purchaseOrder= PurchaseOrderState.待发货;
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@ -441,7 +441,7 @@ namespace BBWY.Server.Business

        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);

            if (payOrderResponse.Success)
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs
@ -3,8 +3,6 @@
    public class CancelPurchaseOrderRequest: PlatformRequest
    {
        public string OrderId { get; set; }
-
-
        public string Remark { get; set; }
    }
 }
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/PayPurchaseOrderRequest.cs
@ -8,13 +8,5 @@ namespace BBWY.Server.Model.Dto
    public  class PayPurchaseOrderRequest : PlatformRequest
    {
        public string OrderId { get; set; }
-
-        public PurchaseAccount PurchaseAccount { get; set; }
-
-
-        /// <summary>
-        /// 采购平台
-        /// </summary>
-        public Enums.Platform PurchasePlatform { get; set; }
    }
 }