wufan
/
ERP
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

Browse Source
master
cmj 1 day ago
parent 451fa24445 afef83eb11
commit fd8125bf5c
2 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File

111
TradeManageNew/DD_OrderServiceNew.asmx.cs
Unescape Escape View File

@ -28959,8 +28959,8 @@ namespace TradeManageNew
ProductType = shopifyProductProfile?.Category, ProductType = shopifyProductProfile?.Category,
Tags = shopifyProductProfile?.Tags, Tags = shopifyProductProfile?.Tags,
Weight = product.Weight.Value, Weight = product.Weight.Value,
JYPrice = 5m, //product.JYPrice.Value, JYPrice = product.JYPrice.Value, //product.JYPrice.Value,
ShippingFee = 5m, //feeCost.Value, ShippingFee = feeCost.Value, //feeCost.Value,
} }
}; };
var shopifyProductRes = shopifyApiClient var shopifyProductRes = shopifyApiClient
@ -29025,8 +29025,8 @@ namespace TradeManageNew
ProductType = shopifyProductProfile?.Category, ProductType = shopifyProductProfile?.Category,
Tags = shopifyProductProfile?.Tags, Tags = shopifyProductProfile?.Tags,
Weight = product.Weight.Value, Weight = product.Weight.Value,
JYPrice =5m,// product.JYPrice.Value, JYPrice = product.JYPrice.Value,// product.JYPrice.Value,
ShippingFee= 5m,// feeCost.Value ShippingFee= feeCost.Value,// feeCost.Value
}, },
Variants = new Variants Variants = new Variants
{ {
@ -29114,44 +29114,83 @@ namespace TradeManageNew
}; };
} }
var originJsonData = JsonConvert.DeserializeObject<ShopifyUsedSaleOrderDto>(originJson); var originJsonData = JsonConvert.DeserializeObject<ShopifyUsedSaleOrderDto>(originJson);
using (var db = new TradeUsedSale.Repositories.ErpDbContext()) using (var db = new TradeUsedSale.Repositories.ErpDbContext())
{ {
var includeUsedSale = false; var includeUsedSale = false;
var errorMessage = string.Empty; var errorMessage = string.Empty;
//Shopify二手订单 //Shopify二手订单
var newDtShopifyUsedSaleOrder = new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrder var newDtShopifyUsedSaleOrder = new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrder();
{ if (originJsonData.Recipient !=null)
OrderId = originJsonData.Order.OrderId, {
OrderNumber = originJsonData.Order.OrderNumber, newDtShopifyUsedSaleOrder = new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrder
OrderName = originJsonData.Order.OrderName, {
CreatedAt = originJsonData.Order.CreatedAt.DateTime, OrderId = originJsonData.Order.OrderId,
UpdatedAt = originJsonData.Order.UpdatedAt.DateTime, OrderNumber = originJsonData.Order.OrderNumber,
ProcessedAt = originJsonData.Order.ProcessedAt.DateTime, OrderName = originJsonData.Order.OrderName,
Name = originJsonData.Recipient.Name, CreatedAt = originJsonData.Order.CreatedAt.DateTime,
Phone = originJsonData.Recipient.Phone, UpdatedAt = originJsonData.Order.UpdatedAt.DateTime,
Full = originJsonData.Recipient.Address.Full, ProcessedAt = originJsonData.Order.ProcessedAt.DateTime,
Detail = originJsonData.Recipient.Address.Detail, Name = originJsonData.Recipient.Name,
Detail2 = originJsonData.Recipient.Address.Detail2, Phone = originJsonData.Recipient.Phone,
City = originJsonData.Recipient.Address.City, Full = originJsonData.Recipient.Address.Full,
Province = originJsonData.Recipient.Address.Province, Detail = originJsonData.Recipient.Address.Detail,
ProvinceCode = originJsonData.Recipient.Address.ProvinceCode, Detail2 = originJsonData.Recipient.Address.Detail2,
Zip = originJsonData.Recipient.Address.Zip, City = originJsonData.Recipient.Address.City,
Country = originJsonData.Recipient.Address.Country, Province = originJsonData.Recipient.Address.Province,
CountryCode = originJsonData.Recipient.Address.CountryCode, ProvinceCode = originJsonData.Recipient.Address.ProvinceCode,
Currency = originJsonData.Financial.Currency, Zip = originJsonData.Recipient.Address.Zip,
TotalPrice = originJsonData.Financial.TotalPrice, Country = originJsonData.Recipient.Address.Country,
SubtotalPrice = originJsonData.Financial.SubtotalPrice, CountryCode = originJsonData.Recipient.Address.CountryCode,
TotalTax = originJsonData.Financial.TotalTax, Currency = originJsonData.Financial.Currency,
TotalDiscounts = originJsonData.Financial.TotalDiscounts, TotalPrice = originJsonData.Financial.TotalPrice,
ShippingPrice = originJsonData.Financial.ShippingPrice, SubtotalPrice = originJsonData.Financial.SubtotalPrice,
PaymentMethod = originJsonData.Financial.PaymentMethod, TotalTax = originJsonData.Financial.TotalTax,
FinancialStatus = originJsonData.Financial.FinancialStatus, TotalDiscounts = originJsonData.Financial.TotalDiscounts,
RefundedAmount = originJsonData.Financial.RefundedAmount, ShippingPrice = originJsonData.Financial.ShippingPrice,
OriginJson = originJson, PaymentMethod = originJsonData.Financial.PaymentMethod,
IsPlaceOrderSuccess = false FinancialStatus = originJsonData.Financial.FinancialStatus,
}; RefundedAmount = originJsonData.Financial.RefundedAmount,
OriginJson = originJson,
IsPlaceOrderSuccess = false
};
}
else
{
newDtShopifyUsedSaleOrder = new TradeUsedSale.Repositories.Models.DT_ShopifyUsedSaleOrder
{
OrderId = originJsonData.Order.OrderId,
OrderNumber = originJsonData.Order.OrderNumber,
OrderName = originJsonData.Order.OrderName,
CreatedAt = originJsonData.Order.CreatedAt.DateTime,
UpdatedAt = originJsonData.Order.UpdatedAt.DateTime,
ProcessedAt = originJsonData.Order.ProcessedAt.DateTime,
Name = originJsonData.Customer.FirstName+" "+ originJsonData.Customer.LastName,
Phone = originJsonData.Customer.Phone,
Full = "",
Detail = "",
Detail2 = "",
City = "",
Province = "",
ProvinceCode = "",
Zip = "",
Country = "",
CountryCode = "",
Currency = originJsonData.Financial.Currency,
TotalPrice = originJsonData.Financial.TotalPrice,
SubtotalPrice = originJsonData.Financial.SubtotalPrice,
TotalTax = originJsonData.Financial.TotalTax,
TotalDiscounts = originJsonData.Financial.TotalDiscounts,
ShippingPrice = originJsonData.Financial.ShippingPrice,
PaymentMethod = originJsonData.Financial.PaymentMethod,
FinancialStatus = originJsonData.Financial.FinancialStatus,
RefundedAmount = originJsonData.Financial.RefundedAmount,
OriginJson = originJson,
IsPlaceOrderSuccess = false
};
}
//Shopify二手订单明细 //Shopify二手订单明细
var newDtShopifyUsedSaleOrderItems = var newDtShopifyUsedSaleOrderItems =

4
TradeManageNew/Models/ShopifyUsedSale/ShopifyUsedSaleOrderDto.cs
Unescape Escape View File

@ -8,13 +8,13 @@ namespace TradeManageNew.Models.ShopifyUsedSale
{ {
[JsonProperty("order")] public Order Order { get; set; } [JsonProperty("order")] public Order Order { get; set; }
[JsonProperty("recipient")] public Recipient Recipient { get; set; } [JsonProperty("recipient", NullValueHandling = NullValueHandling.Ignore)] public Recipient Recipient { get; set; }
[JsonProperty("items")] public List<Item> Items { get; set; } [JsonProperty("items")] public List<Item> Items { get; set; }
[JsonProperty("financial")] public Financial Financial { get; set; } [JsonProperty("financial")] public Financial Financial { get; set; }
[JsonProperty("customer")] public Customer Customer { get; set; } [JsonProperty("customer", NullValueHandling = NullValueHandling.Ignore)]public Customer Customer { get; set; }
[JsonProperty("remark")] public Remark Remark { get; set; } [JsonProperty("remark")] public Remark Remark { get; set; }
} }

Write Preview
Loading…
Cancel
Save