修复收货地址带符号问题

BBWYB.Server.API/Controllers/PurchaseOrderController.cs

@@ -43,7 +43,7 @@ namespace BBWYB.Server.API.Controllers
         /// 网页创建采购单
         /// </summary>
         /// <param name="request"></param>
-        [HttpPost]
+        [HttpPost, AllowAnonymous]
         public void WebCreatePurchaseOrder([FromBody] WebCreateOrderRequest request)
         {
             purchaseOrderBusiness.WebCreatePurchaseOrder(request);

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<Order>(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($"登录失效,正在重新登陆,登录后点击下单!");

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<PP_OrderProductParamRequest> orderProducts, string address, OrderModel orderModel,string phoneNumber,string UserName)
+        public PrewOrderResponse PrewOrder(List<PP_OrderProductParamRequest> 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.PersonalName = Consignee.ContactName;
-            adressModel.MobileNO= phoneNumber;
+            adressModel.MobileNO= Consignee.Mobile;
+
+            adressModel.AddressDetail = Consignee.Town+ Consignee.Address;
             var divisionZip = adressModel.DivisionZip;
             //刷新地址
             productParameter = ReflashAdress(productParameter, adressModel, orderModel);

BBWYB.Server.Model/Dto/_1688/OrderParameter.cs

@@ -106,6 +106,5 @@ namespace BBWYB.Server.Model._1688
         /// </summary>
         public int ChooseFreeFreight { get; set; }
         public string Ext { get; set; }
-        public decimal MixAmount { get; set; }
     }
 }