修复1688下单 收货人匹配失败问题

BBWYB.Client/App.xaml.cs

@@ -89,6 +89,8 @@ namespace BBWYB.Client
             ServiceProvider = serviceCollection.BuildServiceProvider();
 
 
+            gl.Login1688("齐越供应链1号", "jiayou123", true);
+
             base.OnStartup(e);
         }
 

BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -3513,13 +3513,13 @@ namespace BBWYB.Server.Business
 
                 Collect1688Helper collect1688Helper = new Collect1688Helper(cookies);
 
-                var adress = request.Consignee.ContactName + " " + request.Consignee.Mobile + " " + request.Consignee.Province + request.Consignee.City + request.Consignee.Town + request.Consignee.Address;
+                var adress =  request.Consignee.Province + request.Consignee.City + request.Consignee.Town + request.Consignee.Address;
 
 
                 var orderModel = (Model.Enums.OrderModel)request.PurchaseOrderMode;
 
 
-                var prewOrder = collect1688Helper.PrewOrder(orderProductParamList.ToList(), adress, orderModel);
+                var prewOrder = collect1688Helper.PrewOrder(orderProductParamList.ToList(), adress, orderModel, request.Consignee.Mobile, request.Consignee.ContactName);
                 if (prewOrder == null)
                 {
                     throw new BusinessException($"登录失效,正在重新登陆,登录后点击下单!");

BBWYB.Server.Business/_1688Helper/Collect1688Helper.cs

@@ -267,6 +267,10 @@ 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':'([^']+)'");
@@ -298,7 +302,8 @@ namespace BBWYB.Server.Business._1688Helper
                                             FreightId = freightId,
                                             OutId = outId,
                                             OfferPriceRangeJson = offerPriceRangeJson,
-                                            Ext = ext
+                                            Ext = ext,
+                                           MixAmount = mixAmount
 
                                         });
                                     }
@@ -410,6 +415,7 @@ namespace BBWYB.Server.Business._1688Helper
                 List<string> orderList = new List<string>();
                 foreach (var orderProduct in orderGroup.OrderProductParameterList)
                 {
+      
                     string freightId = orderProduct.FreightId;
                     string order = $@"{{""offerId"":""{orderProduct.ProductId}"",""skuId"":""{orderProduct.SpectId}"",""tbSkuId"":""{orderProduct.SkuId}"",""hasSkuUmp"":""false"",""outId"":""{orderProduct.OutId}"",""quantity"":{orderProduct.Quantity},""isfreefreight"":0,""marketingScene"":"""",""offerPriceRangeJson"":[{orderProduct.OfferPriceRangeJson}],""unitPrice"":""{orderProduct.UnitPrice}"",""bundle"":"""",""couple"":"""",""freightId"":""{freightId}"",""rebate"":0,""buyerBearServiceFee"":false,""gift"":""0""}}";
                     orderList.Add(order);
@@ -738,23 +744,25 @@ namespace BBWYB.Server.Business._1688Helper
 
             foreach (var OrderGroupParameter in productParameter.OrderGroupParameterList)
             {
+                //'mixAmount':'100'
                 var group = OrderGroupParameter.Group;
                 var discountFee = OrderGroupParameter.DiscountFee;
-                var sumCarriage = OrderGroupParameter.SumCarriage;
+                var sumCarriage = OrderGroupParameter.SumCarriage.ToString("0.00");
                 var stepName = OrderGroupParameter.StepName;
                 var totalProductAmount = OrderGroupParameter.TotalProductAmount.ToString("0.00");
-                var actualPay = OrderGroupParameter.ActualPay;
+                var actualPay = OrderGroupParameter.ActualPay.ToString("0.00");
                 var actualPayFee = OrderGroupParameter.ActualPayFee;
                 var payFee = OrderGroupParameter.PayFee;
                 var shopCouple = OrderGroupParameter.PromotionId;
                 var chooseFreeFreight = OrderGroupParameter.ChooseFreeFreight;
 
+                
                 foreach (var orderProductParameter in OrderGroupParameter.OrderProductParameterList)
                 {
                     var cargoKey = orderProductParameter.CargoKey;
 
                     var unitPrice = orderProductParameter.UnitPrice.ToString("0.00");
-                    var productAmount = orderProductParameter.ProductAmount;
+                    var productAmount = orderProductParameter.ProductAmount.ToString("0.00");
                     var quantity = orderProductParameter.Quantity;
                     var offerId = orderProductParameter.ProductId;
                     var specId = orderProductParameter.SpectId;
@@ -772,10 +780,11 @@ namespace BBWYB.Server.Business._1688Helper
 
 
                 }
+                string mixAmount = "100";
                 string smarts_m = @$"[{{""group"":""{group}"",""stepNo"":""1"",""templateId"":""30"",""stepName"":""{UrlEncode(stepName, "GB2312")}"",""instantPay"":""0"",""sellerActionName"":"""",""buyerPayTimeout"":""0"",""buyerConfirmTimeout"":""0"",""needSellerAction"":""0"",""transferAfterConfirm"":""0"",""needSellerCallNext"":""0"",""isStepPayAll"":""0"",""agreement"":"""",""needLogistics"":""1"",""percent"":""1.0"",""deliveryPercent"":""1.0"",""payFee"":""{payFee}"",""actualPayFee"":""{actualPayFee}"",""discountFee"":""{discountFee}"",""itemDiscountFee"":""0"",""price"":""0"",""amount"":""1"",""postFee"":""0"",""mergedJsonVar"":""""}}]";
                 smarts_mList.Add(smarts_m);
 
-                string _fm_smart_group_me = @$"{{""group"":""{group}"",""tplCode"":""assureTrade"",""message"":""{remarkMesg}"",""sumCarriage"":""{sumCarriage}"",""totalAmount"":""{actualPay}"",""totalProductAmount"":""{totalProductAmount}"",""chooseFreeFreight"":{chooseFreeFreight},""mixAmount"":"""",""mixNumber"":""1"",""promotionId"":""{shopCouple}"",""umpSysAvailble"":""1"",""toleranceFreight"":""${{model.toleranceCollection.toleranceFreight}}"",""checkCarriage"":1,""filledCarriage"":""0.00"",""isNeedSellerConfirmFlag"":""0"",""lvid"":""{lvid}"",""fundUsageSelected"":""0"",""hasTaosampleCard"":""0"",""anonymousBuyer"":true,""payEntry"":""multiStep"",""bizType"":""{flow}"",""payWay"":""100"",""orderCodFee"":0,""crossPromotionIds"":[],""crossPromotionIdsMap"":{{}},""crossShopPromotions"":[],""terminal"":""pc_browser_null_0.0.0"",""cna"":""{cna}"",""fromkv"":""{fromkv}""}}";
+                string _fm_smart_group_me = @$"{{""group"":""{group}"",""tplCode"":""assureTrade"",""message"":""{remarkMesg}"",""sumCarriage"":""{sumCarriage}"",""totalAmount"":""{actualPay}"",""totalProductAmount"":""{totalProductAmount}"",""chooseFreeFreight"":{chooseFreeFreight},""mixAmount"":""{mixAmount}"",""mixNumber"":""1"",""promotionId"":""{shopCouple}"",""umpSysAvailble"":""1"",""toleranceFreight"":""${{model.toleranceCollection.toleranceFreight}}"",""checkCarriage"":1,""filledCarriage"":""0.00"",""isNeedSellerConfirmFlag"":""0"",""lvid"":""{lvid}"",""fundUsageSelected"":""0"",""hasTaosampleCard"":""0"",""anonymousBuyer"":true,""payEntry"":""multiStep"",""bizType"":""{flow}"",""payWay"":""100"",""orderCodFee"":0,""crossPromotionIds"":[],""crossPromotionIdsMap"":{{}},""crossShopPromotions"":[],""terminal"":""pc_browser_null_0.0.0"",""cna"":""{cna}"",""fromkv"":""{fromkv}""}}";
                 _fm_smart_group_meList.Add($"_fm.smart.{group}.me={UrlEncode(_fm_smart_group_me, "GB2312")}");
 
 
@@ -889,7 +898,7 @@ namespace BBWYB.Server.Business._1688Helper
             return response;
         }
 
-        public PrewOrderResponse PrewOrder(List<PP_OrderProductParamRequest> orderProducts, string address, OrderModel orderModel)
+        public PrewOrderResponse PrewOrder(List<PP_OrderProductParamRequest> orderProducts, string address, OrderModel orderModel,string phoneNumber,string UserName)
         {
             var flow = orderModel.ToString(); //下单类型
                                               //获取时间戳
@@ -908,8 +917,8 @@ namespace BBWYB.Server.Business._1688Helper
 
             var addressCode = adressModel.AddressCode;
             var addressDetail = adressModel.AddressDetail;
-            var personalName = adressModel.PersonalName;
+            adressModel.PersonalName = UserName;
-            var mobileNO = adressModel.MobileNO;
+            adressModel.MobileNO= phoneNumber;
             var divisionZip = adressModel.DivisionZip;
             //刷新地址
             productParameter = ReflashAdress(productParameter, adressModel, orderModel);

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

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