PSE订单处理

1.Command/XYY.Common.Standard/IWebHook.cs

@@ -343,7 +343,7 @@ namespace XYY.Common.Standard
 
             string token = new QYWXAPI().GetToken();
             string url = $"https://qyapi.weixin.qq.com/cgi-bin/media/upload?access_token={token}&type=file";
-            FileInfo fileInfo = new FileInfo(file);
+            //FileInfo fileInfo = new FileInfo(file);
 
             HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
             CookieContainer cookieContainer = new CookieContainer();

3.Service/XYY.Service.Standard.ChannelApi/DeDhl/DeDhlApi.cs

@@ -98,7 +98,7 @@ namespace XYY.Service.Standard.ChannelApi.DeDhl
             string base64Auth = Base64Encode(channel.ApiKey);
             string json = Newtonsoft.Json.JsonConvert.SerializeObject(orderRequest);
             RestClient restClient = new RestClient();
-            RestRequest restRequest = new RestRequest($"{baseUrl}orders");
+            RestRequest restRequest = new RestRequest($"{baseUrl}orders?mustEncode=true");
             restRequest.Method = Method.POST;
             restRequest.AddHeader("Accept-Language", "en-US");
             restRequest.AddHeader("Authorization", $"Basic {base64Auth}");

3.Service/XYY.Service.Standard.ChannelApi/PSE/Api.cs

@@ -163,6 +163,7 @@ namespace XYY.Service.Standard.ChannelApi.PSE
             else
             {
                 param = CreateCreateOrderParam(order, goods, channel, customerCode);
+                /**/
             }
             string json = JsonConvert.SerializeObject(param);
             request.AddJsonBody(param);
@@ -473,7 +474,18 @@ namespace XYY.Service.Standard.ChannelApi.PSE
             {
                 param.orderExtJson = "{\"poZipCode\":\"" + poZipCode + "\",\"partnerEvent\":\"H\"}";
             }
-
+            /*部分线路增加一个SKU显示*/
+            if (channel.Id == 918)
+            {
+                param.orderDetails = orderGoods?.GroupBy(x => new { x.GoodsNumber, x.HsCode, x.CnName, x.EnName }).Select(x => new OrderDetailsItem
+                {
+                    cnName = x.Key.CnName,
+                    enName = x.Key.EnName,
+                    quantity = x.Sum(y => y.Quantity),
+                    hsCode = x.Key.HsCode,
+                    singlePrice = x.Sum(y => y.Quantity * y.DeclareFee) / x.Sum(y => y.Quantity)
+                }).ToList();
+            }
 
             return param;
         }