diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index ba254e6..d8aa512 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -28927,10 +28927,10 @@ namespace TradeManageNew { Return_quantity = 1, ImgUrl = imageUrls.Count > 0 ? imageUrls[0] : null, - ImgUrl2 = imageUrls.Count > 0 ? imageUrls[0] : null, - ImgUrl3 = imageUrls.Count > 0 ? imageUrls[0] : null, - ImgUrl4 = imageUrls.Count > 0 ? imageUrls[0] : null, - ImgUrl5 = imageUrls.Count > 0 ? imageUrls[0] : null, + ImgUrl2 = imageUrls.Count > 1 ? imageUrls[1] : null, + ImgUrl3 = imageUrls.Count > 2 ? imageUrls[2] : null, + ImgUrl4 = imageUrls.Count > 3 ? imageUrls[3] : null, + ImgUrl5 = imageUrls.Count > 4 ? imageUrls[4] : null, StoreName = orderUsedSalePlatform.WarehouseLocation == TradeUsedSale.Enums.WarehouseLocation.East ? "E" @@ -29026,31 +29026,75 @@ namespace TradeManageNew PaymentMethod = originJsonData.Financial.PaymentMethod, FinancialStatus = originJsonData.Financial.FinancialStatus, RefundedAmount = originJsonData.Financial.RefundedAmount, - OriginJson = originJson + OriginJson = originJson, + IsPlaceOrderSuccess = false }; var dtShopifyUsedSaleOrderId = db.InsertWithInt32Identity(newDtShopifyUsedSaleOrder); - foreach (var item in originJsonData.Items) - { - var newDtShopifyUsedSaleOrderItem = - new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrderItem - { - DtShopifyUsedSaleOrderId = dtShopifyUsedSaleOrderId, - OriginSku = item.OriginSku, - Sku = item.Sku, - ProductCode = item.ProductCode, - Quantity = item.Quantity, - Price = item.Price, - Title = item.Title, - VariantTitle = item.VariantTitle, - ProductId = item.ProductId, - VariantId = item.VariantId, - Image = item.Image, - ShippingMethod = item.ShippingMethod - }; + db.BeginTransaction(); + + try + { + foreach (var item in originJsonData.Items) + { + var newDtShopifyUsedSaleOrderItem = + new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrderItem + { + DtShopifyUsedSaleOrderId = dtShopifyUsedSaleOrderId, + OriginSku = item.OriginSku, + Sku = item.Sku, + ProductCode = item.ProductCode, + Quantity = item.Quantity, + Price = item.Price, + Title = item.Title, + VariantTitle = item.VariantTitle, + ProductId = item.ProductId, + VariantId = item.VariantId, + Image = item.Image, + ShippingMethod = item.ShippingMethod + }; + + db.InsertWithInt32Identity(newDtShopifyUsedSaleOrderItem); + + var statement = db.DT_OrderUsedSalePlatform.Where(x => x.BarCode == item.ProductCode) + .Set(x => x.Status, TradeUsedSale.Enums.UsedSalePlatformStatus.PendingPickup); + + if (item.ShippingMethod == "SP") + { + statement = statement.Set(x => x.ShippingMethod, TradeUsedSale.Enums.ShippingMethod.SelfPickup); + } + + if (item.ShippingMethod == "DL") + { + statement = statement.Set(x => x.ShippingMethod, TradeUsedSale.Enums.ShippingMethod.ExpressDelivery); + } - db.InsertWithInt32Identity(newDtShopifyUsedSaleOrderItem); + statement.Update(); + + //Shopify客户端 + //删除产品变体 + // var shopifyApiClient = new ShopifyAPIClient(); + // var productVariantRes = shopifyApiClient.DeleteProductVariantAsync().ConfigureAwait(false) + // .GetAwaiter() + // .GetResult(); + + db.DT_ShopifyUsedSaleOrder.Where(x => x.Id == dtShopifyUsedSaleOrderId) + .Set(x => x.IsPlaceOrderSuccess, true) + .Set(x => x.PlaceOrderMessage, "更新二手订单信息成功") + .Update(); + + } + + db.CommitTransaction(); + } + catch (Exception ex) + { + db.RollbackTransaction(); + + db.DT_ShopifyUsedSaleOrder.Where(x => x.Id == dtShopifyUsedSaleOrderId) + .Set(x => x.PlaceOrderMessage, $"更新二手订单信息失败,原因:{ex.Message}") + .Update(); } } diff --git a/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs b/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs index f856c14..d2e4490 100644 --- a/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs +++ b/TradeUsedSale/Repositories/Models/DT_ShopifyUsedSaleOrder.cs @@ -96,5 +96,15 @@ namespace TradeUsedSale.Repositories.Models /// 原始Json /// public string OriginJson { get; set; } + + /// + /// 是否同步下单信息成功 + /// + public bool IsPlaceOrderSuccess { get; set; } + + /// + /// 下单同步信息 + /// + public string PlaceOrderMessage { get; set; } } } \ No newline at end of file