diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs
index f5d0056..417639d 100644
--- a/TradeManageNew/DD_OrderServiceNew.asmx.cs
+++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs
@@ -28753,6 +28753,7 @@ namespace TradeManageNew
PublishMessage = pageItem.PublishMessage,
TrackingCode= pageItem.TrackingCode,
imgList=pageItem.imgList,
+ outboundTrackCode = pageItem.outboundTrackCode,
};
result.DataSource.Add(resultItem);
}
@@ -30482,15 +30483,15 @@ namespace TradeManageNew
return true;
}
#endregion
- #region 保存
+ #region 编辑
[WebMethod(EnableSession = true)]
- public int update_TemuShopGoodActive(TemuShopGoodActive Model)
+ public int update_TemuShopGoodActive_Data(TemuShopGoodActive Model)
{
Pages.Login(this.Session);
Model.State = 1;
Model.CreateTime = DateTime.Now;
Model.CreateUserId = Convert.ToInt32(Session["UserId"]);
- return DataNew.Update_TemuShopGoodActive(Model);
+ return DataNew.update_TemuShopGoodActive_Data(Model);
}
#endregion
diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs
index eb16726..5b960ea 100644
--- a/TradeManageNew/DataNew.cs
+++ b/TradeManageNew/DataNew.cs
@@ -31167,7 +31167,7 @@ select @ID";
#region 编辑TemuShopGoodActive
- public static int Update_TemuShopGoodActive(TemuShopGoodActive Model)
+ public static int update_TemuShopGoodActive_Data(TemuShopGoodActive Model)
{
string tsql = @"
if @ID>0
diff --git a/TradeManageNew/HuoWuServiceNew.asmx.cs b/TradeManageNew/HuoWuServiceNew.asmx.cs
index 108f39d..d6c2e7d 100644
--- a/TradeManageNew/HuoWuServiceNew.asmx.cs
+++ b/TradeManageNew/HuoWuServiceNew.asmx.cs
@@ -23,6 +23,7 @@ using System.Web.UI;
using System.Text;
using NPOI.HSSF.Model;
+
namespace TradeManageNew
{
///
@@ -7385,113 +7386,213 @@ namespace TradeManageNew
}
}
- //temu 活动导入
- [WebMethod(EnableSession = true)]
- public APIReturnModel ImportTemuHuoDongPrices(string filePath)
- {
- PagesNew.Login(this.Session);
- var userid = Convert.ToInt32(base.Session["UserId"]);
- string ServerFileName = AppDomain.CurrentDomain.BaseDirectory + filePath;
- var rmodel = new APIReturnModel();
- try
- {
- MicrosoftExcel excel = new MicrosoftExcel();
- DataTable tb = excel.ImportExcel(ServerFileName);
-
- string error = "";
- if (tb.Columns.Contains("店铺名") == false) { error = error + "导入模板的 店铺名 列不存在"; }
- if (tb.Columns.Contains("SKU") == false) { error = error + "导入模板的 SKU 列不存在"; }
- if (tb.Columns.Contains("SKUID") == false) { error = error + "导入模板的 SKUID 列不存在"; }
- if (tb.Columns.Contains("价格") == false) { error = error + "导入模板的 价格 列不存在"; }
-
- if (string.IsNullOrEmpty(error) == false)
- {
- rmodel.Code = 0;
- rmodel.Message = error;
- }
- var goods = new List();
- StringBuilder sb = new StringBuilder();
-
- for (int i = 0; i < tb.Rows.Count; i++)
- {
- var shopName = tb.Rows[i]["店铺名"].ToString();
- if (string.IsNullOrEmpty(shopName))
- {
- sb.Append("第" + (i + 1).ToString() + "行店铺名不能为空；");
- continue;
- }
- var shop = DataNew.GetShopByShopName(shopName);
- if (shop == null)
- {
- sb.Append("第" + (i + 1).ToString() + "行店铺名:" + shopName + "不存在；");
- continue;
- }
-
- var sku = tb.Rows[i]["SKU"].ToString();
- if (string.IsNullOrEmpty(sku))
- {
- sb.Append("第" + (i + 1).ToString() + "行SKU不能为空；");
- continue;
- }
-
-
- var SKUID = tb.Rows[i]["SKUID"].ToString();
- if (string.IsNullOrEmpty(SKUID))
- {
- sb.Append("第" + (i + 1).ToString() + "行SKUID不能为空；");
- continue;
- }
-
- if (string.IsNullOrEmpty(tb.Rows[i]["价格"].ToString()))
- {
- sb.Append("第" + (i + 1).ToString() + "行价格不能为空；");
- continue;
- }
-
- var data = DataNew.GetTemuShopGoodPrice(shop.ShopId.Value, sku, SKUID);
- if (data != null)
- {
- sb.Append("第" + (i + 1).ToString() + "行已存在相同数据；");
- continue;
- }
-
- var md = new TemuShopGoodActive()
- {
- Shopid = shop.ShopId.Value,
- SPUID = SKUID,
- SKU = sku,
- BasePrice = Convert.ToDecimal(tb.Rows[i]["价格"]),
- CreateUserId = userid,
- CreateTime=DateTime.Now,
- State=1,
- };
-
- goods.Add(md);
- }
-
- if (sb.Length > 0)
- {
- rmodel.Code = 0;
- rmodel.Message = sb.ToString();
- return rmodel;
- }
-
- foreach (var md in goods)
- {
- DataNew.Save_TemuShopGoodActive(md);
- }
-
- rmodel.Code = 1;
- rmodel.Message = "";
- return rmodel;
- }
- catch (Exception ex)
- {
- rmodel.Code = 0;
- rmodel.Message = ex.Message;
- return rmodel;
- }
- }
+ ////temu 活动导入
+ //[WebMethod(EnableSession = true)]
+ //public APIReturnModel ImportTemuHuoDongPrices(string filePath)
+ //{
+ // PagesNew.Login(this.Session);
+ // var userid = Convert.ToInt32(base.Session["UserId"]);
+ // string ServerFileName = AppDomain.CurrentDomain.BaseDirectory + filePath;
+ // var rmodel = new APIReturnModel();
+ // try
+ // {
+ // MicrosoftExcel excel = new MicrosoftExcel();
+ // DataTable tb = excel.ImportExcel(ServerFileName);
+
+ // string error = "";
+ // if (tb.Columns.Contains("店铺名") == false) { error = error + "导入模板的 店铺名 列不存在"; }
+ // if (tb.Columns.Contains("SKU") == false) { error = error + "导入模板的 SKU 列不存在"; }
+ // if (tb.Columns.Contains("SKUID") == false) { error = error + "导入模板的 SKUID 列不存在"; }
+ // if (tb.Columns.Contains("价格") == false) { error = error + "导入模板的 价格 列不存在"; }
+ // if (tb.Columns.Contains("折扣") == false) { error = error + "导入模板的 折扣 列不存在"; }
+ // if (tb.Columns.Contains("售价") == false) { error = error + "导入模板的 售价 列不存在"; }
+ // if (tb.Columns.Contains("数量") == false) { error = error + "导入模板的 数量 列不存在"; }
+
+ // if (string.IsNullOrEmpty(error) == false)
+ // {
+ // rmodel.Code = 0;
+ // rmodel.Message = error;
+ // }
+ // var data = new List();
+ // StringBuilder sb = new StringBuilder();
+
+ // var shopName = tb.Rows[1]["店铺名"].ToString();
+ // if (string.IsNullOrEmpty(shopName))
+ // {
+ // sb.Append("第" + (2).ToString() + "行店铺名不能为空；");
+
+ // }
+ // var shop = DataNew.GetShopByShopName(shopName);
+ // if (shop == null)
+ // {
+ // sb.Append("第" + (2).ToString() + "行店铺名:" + shopName + "不存在；");
+ // }
+
+ // var sku = tb.Rows[1]["SKU"].ToString();
+ // if (string.IsNullOrEmpty(sku))
+ // {
+ // sb.Append("第" + (2).ToString() + "行SKU不能为空；");
+ // }
+ // var SKUID = tb.Rows[1]["SKUID"].ToString();
+ // if (string.IsNullOrEmpty(SKUID))
+ // {
+ // sb.Append("第" + (2).ToString() + "行SKUID不能为空；");
+ // }
+
+ // if (string.IsNullOrEmpty(tb.Rows[1]["价格"].ToString()))
+ // {
+ // sb.Append("第" + (2).ToString() + "行价格不能为空；");
+ // }
+
+ // if (string.IsNullOrEmpty(tb.Rows[1]["折扣"].ToString()))
+ // {
+ // sb.Append("第" + (2).ToString() + "行折扣不能为空；");
+ // }
+ // if (string.IsNullOrEmpty(tb.Rows[1]["售价"].ToString()))
+ // {
+ // sb.Append("第" + (2).ToString() + "行售价不能为空；");
+ // }
+ // if (string.IsNullOrEmpty(tb.Rows[1]["数量"].ToString()))
+ // {
+ // sb.Append("第" + (2).ToString() + "行数量不能为空；");
+ // }
+
+ // var md = new TemuShopGoodActive()
+ // {
+ // Shopid = shop.ShopId.Value,
+ // SPUID = SKUID,
+ // SKU = sku,
+ // BasePrice = Convert.ToDecimal(tb.Rows[1]["价格"].ToString()),
+ // CreateUserId = userid,
+ // CreateTime = DateTime.Now,
+ // State = 1,
+ // };
+ // var mddetail = new TemuShopGoodActiveDetail()
+ // {
+ // OffNum = Convert.ToDecimal(tb.Rows[1]["折扣"].ToString()),
+ // SalePrice = Convert.ToDecimal(tb.Rows[1]["售价"].ToString()),
+ // ActiveNum= Convert.ToInt32(tb.Rows[1]["数量"].ToString()),
+ // };
+ // md.ListModel.Add(mddetail);
+ // //md.ListModel
+ // data.Add(md);
+
+ // for (int i = 2; i < tb.Rows.Count; i++)
+ // {
+ // int shopid2 = 0;
+ // var shopName2 = tb.Rows[i]["店铺名"].ToString();
+ // var sku2 = tb.Rows[i]["SKU"].ToString();
+ // var SKUID2 = tb.Rows[i]["SKUID"].ToString();
+ // var price2 = tb.Rows[i]["价格"].ToString();
+ // var shopNamei = tb.Rows[i-1]["店铺名"].ToString();
+ // var skui = tb.Rows[i-1]["SKU"].ToString();
+ // var SKUIDi = tb.Rows[i-1]["SKUID"].ToString();
+ // var shopi = DataNew.GetShopByShopName(shopNamei);
+ // var md2 = new TemuShopGoodActive();
+
+ // if (string.IsNullOrEmpty(shopName2)&& string.IsNullOrEmpty(sku2) && string.IsNullOrEmpty(sku2) )
+ // {
+
+ // md2 = data.Where(p => p.Shopid == shopi.ShopId.Value&&p.SKU== skui&&p.SPUID== SKUIDi).FirstOrDefault();
+ // }
+
+
+ // if (string.IsNullOrEmpty(shopName2))
+ // {
+ // var shop2 = DataNew.GetShopByShopName(shopNamei);
+ // tb.Rows[i]["店铺名"] = shopNamei;
+ // shopName2 = tb.Rows[i]["店铺名"].ToString();
+
+ // if (shop2 != null)
+ // {
+ // shopid2 = shop2.ShopId.Value;
+ // }
+ // else
+ // {
+ // sb.Append("第" + (i - 1).ToString() + "行店铺名:" + shopName2 + "不存在；");
+ // }
+ // }
+ // else
+ // {
+ // shopid2 = DataNew.GetShopByShopName(shopName2).ShopId.Value;
+ // }
+ // if (string.IsNullOrEmpty(sku2))
+ // {
+ // tb.Rows[i]["SKU"] = tb.Rows[i - 1]["SKU"];
+ // sku2 = tb.Rows[i]["SKU"].ToString();
+ // }
+ // if (string.IsNullOrEmpty(SKUID2))
+ // {
+ // tb.Rows[i]["SKUID"] = tb.Rows[i - 1]["SKUID"];
+ // SKUID2 = tb.Rows[i]["SKUID"].ToString();
+ // }
+ // if (string.IsNullOrEmpty(price2))
+ // {
+ // sb.Append("第" + (i + 1).ToString() + "行价格不能为空；");
+ // }
+ // if (string.IsNullOrEmpty(tb.Rows[i]["折扣"].ToString()))
+ // {
+ // sb.Append("第" + (i + 1).ToString() + "行折扣不能为空；");
+ // }
+ // if (string.IsNullOrEmpty(tb.Rows[i]["售价"].ToString()))
+ // {
+ // sb.Append("第" + (i + 1).ToString() + "行售价不能为空；");
+ // }
+ // if (string.IsNullOrEmpty(tb.Rows[i]["数量"].ToString()))
+ // {
+ // sb.Append("第" + (i + 1).ToString() + "行数量不能为空；");
+ // }
+ // var exdata = DataNew.GetTemuShopGoodPrice(shop.ShopId.Value, sku, SKUID);
+ // //if (exdata != null)
+ // //{
+ // // sb.Append("第" + (i + 1).ToString() + "行已存在相同数据；");
+ // // continue;
+ // //}
+ // if (md2==null)
+ // {
+ // md2.Shopid = shopid2;
+ // md2.SKU = sku2;
+ // md2.SPUID = SKUID2;
+ // md2.BasePrice = Convert.ToDecimal(price2);
+ // md2.CreateUserId = userid;
+ // md2.CreateTime = DateTime.Now;
+ // md2.State = 1;
+ // }
+
+ // var mddetail2 = new TemuShopGoodActiveDetail()
+ // {
+ // OffNum = Convert.ToDecimal(tb.Rows[i]["折扣"].ToString()),
+ // SalePrice = Convert.ToDecimal(tb.Rows[i]["售价"].ToString()),
+ // ActiveNum = Convert.ToInt32(tb.Rows[i]["数量"].ToString()),
+ // };
+ // md2.ListModel.Add(mddetail);
+
+ // data.Add(md);
+ // }
+
+ // if (sb.Length > 0)
+ // {
+ // rmodel.Code = 0;
+ // rmodel.Message = sb.ToString();
+ // return rmodel;
+ // }
+
+ // foreach (var i in data)
+ // {
+ // DataNew.Save_TemuShopGoodActive(i);
+ // }
+
+ // rmodel.Code = 1;
+ // rmodel.Message = "";
+ // return rmodel;
+ // }
+ // catch (Exception ex)
+ // {
+ // rmodel.Code = 0;
+ // rmodel.Message = ex.Message;
+ // return rmodel;
+ // }
+ //}
diff --git a/TradeManageNew/Models/Shage/SelfPickupOrderUsedSalePlatformInput.cs b/TradeManageNew/Models/Shage/SelfPickupOrderUsedSalePlatformInput.cs
index 3d5fe08..d92e27c 100644
--- a/TradeManageNew/Models/Shage/SelfPickupOrderUsedSalePlatformInput.cs
+++ b/TradeManageNew/Models/Shage/SelfPickupOrderUsedSalePlatformInput.cs
@@ -11,5 +11,7 @@ namespace TradeManageNew.Models.Shage
public int Status { get; set; }
public string imgList { get; set; }
+
+ public string outboundTrackCode { get; set; }
}
}
\ No newline at end of file
diff --git a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs
index 113efa4..71b12eb 100644
--- a/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs
+++ b/TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs
@@ -111,5 +111,9 @@ namespace TradeManageNew.Models.ShopifyUsedSale
/// imgList
///
public string imgList { get; set; }
+ ///
+ /// outboundTrackCode
+ ///
+ public string outboundTrackCode { get; set; }
}
}
\ No newline at end of file
diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs
index 45d5175..4522d90 100644
--- a/TradeManageNew/OuterService/ShageService.ashx.cs
+++ b/TradeManageNew/OuterService/ShageService.ashx.cs
@@ -2076,6 +2076,7 @@ namespace TradeManageNew.OuterService
.Set(x => x.LastModifierId, input.UserId)
.Set(x => x.LastModificationTime, DateTime.Now)
.Set(x => x.imgList, input.imgList)
+ .Set(x => x.outboundTrackCode, input.outboundTrackCode)
.Update();
}
}
diff --git a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs
index 8fd0c2c..ce934c4 100644
--- a/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs
+++ b/TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs
@@ -119,8 +119,12 @@ namespace TradeUsedSale.Repositories.Models
public decimal TotalNetCharge { get; set; }
///
- /// 运费
+ /// imgList
///
public string imgList { get; set; }
+ ///
+ /// outboundTrackCode
+ ///
+ public string outboundTrackCode { get; set; }
}
}
\ No newline at end of file