From c1e49357e73e735c26c025ec8953c23869b08d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=9E=E9=B1=BC?= <506583276@qq.com> Date: Wed, 10 Apr 2024 10:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=B8=A6=E7=AC=A6=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PurchaseOrderController.cs | 2 +- .../PurchaseOrder/PurchaseOrderBusiness.cs | 10 ++++++---- .../_1688Helper/Collect1688Helper.cs | 20 +++++++++---------- .../Dto/_1688/OrderParameter.cs | 1 - 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs index ba7683f..6529d47 100644 --- a/BBWYB.Server.API/Controllers/PurchaseOrderController.cs +++ b/BBWYB.Server.API/Controllers/PurchaseOrderController.cs @@ -43,7 +43,7 @@ namespace BBWYB.Server.API.Controllers /// 网页创建采购单 /// /// - [HttpPost] + [HttpPost, AllowAnonymous] public void WebCreatePurchaseOrder([FromBody] WebCreateOrderRequest request) { purchaseOrderBusiness.WebCreatePurchaseOrder(request); diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index ac504a4..cb16449 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -3382,7 +3382,7 @@ namespace BBWYB.Server.Business public void WebCreatePurchaseOrder(WebCreateOrderRequest request) { - nLogManager.Default().Info($"CreatePurchaseOrder\r\n{JsonConvert.SerializeObject(request)}"); + nLogManager.Default().Info($"WebCreateOrderRequest\r\n{JsonConvert.SerializeObject(request)}"); var dbOrder = fsql.Select(request.OrderId).ToOne(); if (dbOrder == null) @@ -3513,13 +3513,15 @@ namespace BBWYB.Server.Business Collect1688Helper collect1688Helper = new Collect1688Helper(cookies); - var adress = request.Consignee.Province + request.Consignee.City + request.Consignee.Town + request.Consignee.Address; + var adress = request.Consignee.Province + request.Consignee.City+request.Consignee.County + request.Consignee.Town ; - var orderModel = (Model.Enums.OrderModel)request.PurchaseOrderMode; + var detailAdress = request.Consignee.Town + request.Consignee.Address; + var orderModel = (Model.Enums.OrderModel)request.PurchaseOrderMode; + //+ request.Consignee.Address - var prewOrder = collect1688Helper.PrewOrder(orderProductParamList.ToList(), adress, orderModel, request.Consignee.Mobile, request.Consignee.ContactName); + var prewOrder = collect1688Helper.PrewOrder(orderProductParamList.ToList(), orderModel, request.Consignee); if (prewOrder == null) { throw new BusinessException($"登录失效,正在重新登陆,登录后点击下单!"); diff --git a/BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs b/BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs index 338b9f9..d6d3d42 100644 --- a/BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs +++ b/BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs @@ -1,6 +1,7 @@  using BBWYB.Common.Models; using BBWYB.Server.Model._1688; +using BBWYB.Server.Model.Dto; using HtmlAgilityPack; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -267,11 +268,6 @@ namespace BBWYB.Server.Business._1688Helper //'ext':'{\"detailOrderBizAttributes\":{\"b_cargo_from\":\"offerdetail:pc;ipvId:2150462317125683404374580e106c\"}}', var ext = GetRegexValue(data_source, "'ext':'([^']+)'")?.Replace("\\"","\""); - ////'mixAmount':'100' - - var mixAmount = decimal.Parse(GetRegexValue(data_source, "'mixAmount':'([^']+)'")); - - //'offerId':'563883060952', var offerId = GetRegexValue(data_source, "'offerId':'([^']+)'"); @@ -303,7 +299,6 @@ namespace BBWYB.Server.Business._1688Helper OutId = outId, OfferPriceRangeJson = offerPriceRangeJson, Ext = ext, - MixAmount = mixAmount }); } @@ -898,7 +893,7 @@ namespace BBWYB.Server.Business._1688Helper return response; } - public PrewOrderResponse PrewOrder(List orderProducts, string address, OrderModel orderModel,string phoneNumber,string UserName) + public PrewOrderResponse PrewOrder(List orderProducts, OrderModel orderModel, ConsigneeRequest Consignee) { var flow = orderModel.ToString(); //下单类型 //获取时间戳 @@ -908,6 +903,9 @@ namespace BBWYB.Server.Business._1688Helper var _csrf_token = productParameter.Csrf_token; var lvid = productParameter.Lvid; var orderUrl = productParameter.OrderUrl; + + var address = Consignee.Province+ Consignee.City+ Consignee.County; + var adressModel = InputAddress(address, _csrf_token); if (adressModel == null) { @@ -916,9 +914,11 @@ namespace BBWYB.Server.Business._1688Helper AddLog?.Invoke($"获取地址信息成功,姓名:{adressModel.PersonalName},手机号:{adressModel.MobileNO},地址:{adressModel.AddressDetail},邮编:{adressModel.DivisionZip}"); var addressCode = adressModel.AddressCode; - var addressDetail = adressModel.AddressDetail; - adressModel.PersonalName = UserName; - adressModel.MobileNO= phoneNumber; + + adressModel.PersonalName = Consignee.ContactName; + adressModel.MobileNO= Consignee.Mobile; + + adressModel.AddressDetail = Consignee.Town+ Consignee.Address; var divisionZip = adressModel.DivisionZip; //刷新地址 productParameter = ReflashAdress(productParameter, adressModel, orderModel); diff --git a/BBWYB.Server.Model/Dto/_1688/OrderParameter.cs b/BBWYB.Server.Model/Dto/_1688/OrderParameter.cs index 6ae7c80..9704536 100644 --- a/BBWYB.Server.Model/Dto/_1688/OrderParameter.cs +++ b/BBWYB.Server.Model/Dto/_1688/OrderParameter.cs @@ -106,6 +106,5 @@ namespace BBWYB.Server.Model._1688 /// public int ChooseFreeFreight { get; set; } public string Ext { get; set; } - public decimal MixAmount { get; set; } } }