|
|
|
@ -28953,8 +28953,8 @@ namespace TradeManageNew
|
|
|
|
|
ProductType = shopifyProductProfile?.Category,
|
|
|
|
|
Tags = shopifyProductProfile?.Tags,
|
|
|
|
|
Weight = product.Weight.Value,
|
|
|
|
|
JYPrice = product.JYPrice.Value,
|
|
|
|
|
ShippingFee = feeCost.Value,
|
|
|
|
|
JYPrice = 5m, //product.JYPrice.Value,
|
|
|
|
|
ShippingFee = 5m, //feeCost.Value,
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
var shopifyProductRes = shopifyApiClient
|
|
|
|
@ -29019,8 +29019,8 @@ namespace TradeManageNew
|
|
|
|
|
ProductType = shopifyProductProfile?.Category,
|
|
|
|
|
Tags = shopifyProductProfile?.Tags,
|
|
|
|
|
Weight = product.Weight.Value,
|
|
|
|
|
JYPrice = product.JYPrice.Value,
|
|
|
|
|
ShippingFee = feeCost.Value
|
|
|
|
|
JYPrice =5m,// product.JYPrice.Value,
|
|
|
|
|
ShippingFee= 5m,// feeCost.Value
|
|
|
|
|
},
|
|
|
|
|
Variants = new Variants
|
|
|
|
|
{
|
|
|
|
@ -29499,7 +29499,8 @@ namespace TradeManageNew
|
|
|
|
|
{
|
|
|
|
|
using (var db = new TradeUsedSale.Repositories.ErpDbContext())
|
|
|
|
|
{
|
|
|
|
|
var orderUsedSaleApplyDtos = db.DT_OrderUsedSaleApply.Where(x => x.UsedSaleId == Id)
|
|
|
|
|
var orderUsedSaleApplyDtos = db.DT_OrderUsedSaleApply.Where(x => x.UsedSaleId == Id &&
|
|
|
|
|
x.IsDeleted == false)
|
|
|
|
|
.Select(o => new OrderUsedSaleApplyDto
|
|
|
|
|
{
|
|
|
|
|
UsedSaleBarCode = o.UsedSaleBarCode,
|
|
|
|
@ -29870,6 +29871,13 @@ namespace TradeManageNew
|
|
|
|
|
byte[] imageBytes = Convert.FromBase64String(base64Image);
|
|
|
|
|
//保存为 PNG 文件 fedexCache
|
|
|
|
|
string labelPath = AppDomain.CurrentDomain.BaseDirectory + "attached/fedexCache/";
|
|
|
|
|
|
|
|
|
|
// 校验路径是否存在,如果不存在则创建
|
|
|
|
|
if (!Directory.Exists(labelPath))
|
|
|
|
|
{
|
|
|
|
|
Directory.CreateDirectory(labelPath);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var imagePath = labelPath + fedexData.MasterTrackingNumber + ".png";
|
|
|
|
|
File.WriteAllBytes(imagePath, imageBytes);
|
|
|
|
|
|
|
|
|
|