diff --git a/TradeManage.sln b/TradeManage.sln index 342a953..946c782 100644 --- a/TradeManage.sln +++ b/TradeManage.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.11.35327.3 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32106.194 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TradeManageNew", "TradeManageNew\TradeManageNew.csproj", "{6D7B8380-17AA-410D-A119-E7A04C2822E3}" EndProject @@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiNew", "ApiNew\ApiNew.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetLibrary", "NetLibrary\NetLibrary.csproj", "{67D6D180-0BE1-46EA-9CFB-FF738E8BC158}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ERPOMS", "ERPOMS\ERPOMS.csproj", "{A0751078-7160-4648-82A4-30E3ADEBAF2B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TradeUsedSale", "TradeUsedSale\TradeUsedSale.csproj", "{F712279E-1070-4865-855C-9EFD7A8345F4}" EndProject Global @@ -61,10 +59,6 @@ Global {67D6D180-0BE1-46EA-9CFB-FF738E8BC158}.Debug|Any CPU.Build.0 = Debug|Any CPU {67D6D180-0BE1-46EA-9CFB-FF738E8BC158}.Release|Any CPU.ActiveCfg = Release|Any CPU {67D6D180-0BE1-46EA-9CFB-FF738E8BC158}.Release|Any CPU.Build.0 = Release|Any CPU - {A0751078-7160-4648-82A4-30E3ADEBAF2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A0751078-7160-4648-82A4-30E3ADEBAF2B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A0751078-7160-4648-82A4-30E3ADEBAF2B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A0751078-7160-4648-82A4-30E3ADEBAF2B}.Release|Any CPU.Build.0 = Release|Any CPU {F712279E-1070-4865-855C-9EFD7A8345F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F712279E-1070-4865-855C-9EFD7A8345F4}.Debug|Any CPU.Build.0 = Debug|Any CPU {F712279E-1070-4865-855C-9EFD7A8345F4}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index 0da34d6..c390b14 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index 64f985c..344ee4e 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -30457,6 +30457,84 @@ namespace TradeManageNew } return ""; } + #endregion + + + #region TemuShopGoodActive页 + #region 保存 + [WebMethod(EnableSession = true)] + public int Save_TemuShopGoodActive(TemuShopGoodActive Model) + { + Pages.Login(this.Session); + return DataNew.Save_TemuShopGoodActive(Model); + } + #endregion + #region 删除 + [WebMethod(EnableSession = true)] + public bool Delete_TemuShopGoodActive(int ID) + { + PagesNew.Login(this.Session); + DataNew.Delete_TemuShopGoodActive(ID); + return true; + } + #endregion + #region 返回Model + [WebMethod(EnableSession = true)] + public TemuShopGoodActive GetModel_TemuShopGoodActive(int ID) + { + Pages.Login(this.Session); + var Model = DataNew.GetModel_TemuShopGoodActive(ID); + return Model; + } + #endregion + #region 分页查询 + [WebMethod(EnableSession = true)] + public JsonModel> GetListTemuShopGoodActive(DateTime? StartDate, DateTime? StopDate, int State, int PageIndex, int PageSize) + { + PagesNew.Login(this.Session); + RefParameterCollection where = new RefParameterCollection(); + if (StartDate != null) where.Add(new RefParameter("InDate", ">=", StartDate, System.Data.DbType.DateTime)); + if (StopDate != null) where.Add(new RefParameter("convert(varchar(10), InDate, 120)", "<=", StopDate, System.Data.DbType.DateTime)); + if (State > -1) where.Add(new RefParameter("a.State", "=", State, DbType.Int32)); + JsonModel> resultModel = new JsonModel>(); + int RowCount = 0; + resultModel.DataSource = DataNew.GetListTemuShopGoodActive(where, PageIndex, PageSize, "", out RowCount); + resultModel.RowCount = RowCount; + return resultModel; + } + #endregion + + + + #region 普通查询列表 + [WebMethod(EnableSession = true)] + public List GetListTemuShopGoodActive3() + { + PagesNew.Login(this.Session); + var ListModel = DataNew.GetListTemuShopGoodActive(); + return ListModel; + } + #endregion + + + #region 分页查询 + [WebMethod(EnableSession = true)] + public JsonModel> GetListTemuShopGoodActive(string cs, int PageIndex, int PageSize) + { + PagesNew.Login(this.Session); + string where = CustomIO.Base64StringToString(cs); + if (where != "") where = "where " + where.Substring(4); + var resultModel = new JsonModel>(); + int RowCount = 0; + resultModel.DataSource = DataNew.GetListTemuShopGoodActive(where, PageIndex, PageSize, "", out RowCount); + resultModel.RowCount = RowCount; + return resultModel; + } + #endregion + + + + #endregion } diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index 5d4e529..db7738c 100644 --- a/TradeManageNew/DataNew.cs +++ b/TradeManageNew/DataNew.cs @@ -30845,5 +30845,175 @@ end } #endregion + + #region 保存 + public static int Save_TemuShopGoodActive(TemuShopGoodActive Model) + { + string tsql = @" +if @ID>0 +begin +Update [TemuShopGoodActive] set [Shopid]=@Shopid,[SKU]=@SKU,[SPUID]=@SPUID,[BasePrice]=@BasePrice,[CreateUserId]=@CreateUserId,[CreateTime]=@CreateTime,[PostPrice]=@PostPrice,[State]=@State where ID=@ID +delete from TemuShopGoodActiveDetail where ActiveId=@ID +end +else +begin +INSERT INTO [TemuShopGoodActive]([Shopid],[SKU],[SPUID],[BasePrice],[CreateUserId],[CreateTime],[PostPrice],[State])values(@Shopid,@SKU,@SPUID,@BasePrice,@CreateUserId,@CreateTime,@PostPrice,@State) +set @ID=SCOPE_IDENTITY() +end +select @ID"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, "@ID", DbType.Int32, Model.ID); + db.AddInParameter(cmd, "@Shopid", DbType.Int32, Model.Shopid); + db.AddInParameter(cmd, "@SKU", DbType.String, Model.SKU); + db.AddInParameter(cmd, "@SPUID", DbType.String, Model.SPUID); + db.AddInParameter(cmd, "@BasePrice", DbType.Decimal, Model.BasePrice); + db.AddInParameter(cmd, "@CreateUserId", DbType.Int32, Model.CreateUserId); + db.AddInParameter(cmd, "@CreateTime", DbType.DateTime, Model.CreateTime); + db.AddInParameter(cmd, "@PostPrice", DbType.Decimal, Model.PostPrice); + db.AddInParameter(cmd, "@State", DbType.Int32, Model.State); + int a = Convert.ToInt32(db.ExecuteScalar(cmd)); + tsql = @"INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[LeftNum])values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@LeftNum)"; + cmd = db.GetSqlStringCommand(tsql); + foreach (var item in Model.ListModel) + { + cmd.Parameters.Clear(); + db.AddInParameter(cmd, "@ActiveId", DbType.Int32, a); + db.AddInParameter(cmd, "@OffNum", DbType.Decimal, item.OffNum); + db.AddInParameter(cmd, "@SalePrice", DbType.Decimal, item.SalePrice); + db.AddInParameter(cmd, "@ActiveNum", DbType.Int32, item.ActiveNum); + db.AddInParameter(cmd, "@LeftNum", DbType.Int32, item.LeftNum); + db.ExecuteNonQuery(cmd); + } + return a; + } + #endregion + #region 删除 + public static void Delete_TemuShopGoodActive(int ID) + { + string tsql = @" + delete from TemuShopGoodActive where ID=@ID + delete from TemuShopGoodActiveDetail where ActiveId=@ID"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, "@ID", DbType.Int32, ID); + db.ExecuteNonQuery(cmd); + } + #endregion + #region 删除明细 + public static void DeleteDetail_TemuShopGoodActive(int Id) + { + string tsql = @" +delete from TemuShopGoodActiveDetail where Id=@Id"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, "@Id", DbType.Int32, Id); + db.ExecuteNonQuery(cmd); + } + #endregion + #region 返回Model + public static TemuShopGoodActive GetModel_TemuShopGoodActive(int ID) + { + TemuShopGoodActive model = null; + //string tsql = "select a.ID,a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State from TemuShopGoodActive"; + string tsql = @" + select * from TemuShopGoodActive where ID=@ID + select * from TemuShopGoodActiveDetail where ActiveId=@ID"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, "@ID", DbType.Int32, ID); + DataSet ds = db.ExecuteDataSet(cmd); + if (ds.Tables[0].Rows.Count > 0) + { + model = ds.Tables[0].Rows[0].ToModel(); + model.ListModel = ds.Tables[1].ToList(); + } + return model; + } + #endregion + #region 分页查询 + public static List GetListTemuShopGoodActive(RefParameterCollection where, int PageIndex, int PageSize, string Sort, out int RowCount) + { + if (where == null) where = new RefParameterCollection(); + QueryService ser = new QueryService(); + ser.Fields = @"ID=cast(a.ID as int),a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State"; + ser.Tables = @"TemuShopGoodActive a"; + ser.Filter = where.GetWhere(System.Data.CommandType.Text); + ser.PageIndex = PageIndex; + ser.PageSize = PageSize; + ser.Sort = Sort; + ser.KeyName = "ID"; + string tsql = ser.GetText(); + where.AddOutParameter("RowCount", System.Data.DbType.Int32); ; + List ListModel = null; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, where); + DataTable tb = db.ExecuteDataTable(cmd); + RowCount = Convert.ToInt32(cmd.Parameters["@RowCount"].Value); + ListModel = tb.ToList(); + return ListModel; + } + #endregion + + #region 多条件普通查询 + public static List GetListTemuShopGoodActive(RefParameterCollection where, string Sort) + { + if (where == null) where = new RefParameterCollection(); + QueryOrdService ser = new QueryOrdService(); + //ser.Fields = "a.ID,a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State"; + ser.Fields = "a.*"; + ser.Tables = @"TemuShopGoodActive a"; + ser.Filter = where.GetWhere(System.Data.CommandType.Text); + ser.KeyName = "ID"; + ser.Sort = Sort; + string tsql = ser.GetText(); + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, where); + DataTable tb = db.ExecuteDataTable(cmd); + List ListModel = tb.ToList(); + return ListModel; + } + #endregion + + + #region 返回列表 + public static List GetListTemuShopGoodActive() + { + //string tsql = "select a.ID,a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State from TemuShopGoodActive"; + string tsql = "select * from TemuShopGoodActive"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + DataTable tb = db.ExecuteDataTable(cmd); + List ListModel = tb.ToList(); + return ListModel; + } + #endregion + + + #region 分页动态条件查询 + public static List GetListTemuShopGoodActive(string where, int PageIndex, int PageSize, string Sort, out int RowCount) + { + QueryService2 ser = new QueryService2(); + ser.Tsql = "select ID=cast(a.ID as int),a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State from TemuShopGoodActive a"; + ser.Tsql += " " + ser.Filter(where); + ser.PageIndex = PageIndex; + ser.PageSize = PageSize; + if (string.IsNullOrEmpty(Sort) == true) { ser.Sort = "a.ID desc"; } + else { ser.Sort = Sort; } + string tsql = ser.GetText(); + List ListModel = null; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddOutParameter(cmd, "@RowCount", DbType.Int32, 4); + DataTable tb = db.ExecuteDataTable(cmd); + RowCount = Convert.ToInt32(cmd.Parameters["@RowCount"].Value); + ListModel = tb.ToList(); + return ListModel; + } + #endregion + + } } \ No newline at end of file diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx new file mode 100644 index 0000000..d3efea2 --- /dev/null +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx @@ -0,0 +1,407 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TemuShopGoodPriceNew.aspx.cs" Inherits="TradeManageNew.Huowu.TemuShopGoodPriceNew" %> + + + + + + + + Temu店铺商品售价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Temu店铺活动 +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ *店铺： + + *SKU： + + +
+ *SPUID： + + + + *基础价格： + + +
+ *预估运费： + + + + + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
店铺：SKU/SPUID：
+ +   +   +   +
+
+ +
+ + + diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.cs b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.cs new file mode 100644 index 0000000..5f84a3d --- /dev/null +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace TradeManageNew.Huowu +{ + public partial class TemuShopGoodPriceNew : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.designer.cs b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.designer.cs new file mode 100644 index 0000000..50049b1 --- /dev/null +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace TradeManageNew.Huowu +{ + + + public partial class TemuShopGoodPriceNew + { + } +} diff --git a/TradeManageNew/ModelNew.cs b/TradeManageNew/ModelNew.cs index 84a4700..5099fbf 100644 --- a/TradeManageNew/ModelNew.cs +++ b/TradeManageNew/ModelNew.cs @@ -11264,5 +11264,71 @@ namespace TradeManageNew } - + public class TemuShopGoodActive + { + /// + /// ID + /// + public Int32? ID { get; set; } + /// + /// Shopid + /// + public Int32? Shopid { get; set; } + /// + /// SKU + /// + public String SKU { get; set; } + /// + /// SPUID + /// + public String SPUID { get; set; } + /// + /// 基础价格 + /// + public Decimal? BasePrice { get; set; } + /// + /// CreateUserId + /// + public Int32? CreateUserId { get; set; } + /// + /// 创建日期 + /// + public DateTime? CreateTime { get; set; } + /// + /// PostPrice + /// + public Decimal? PostPrice { get; set; } + /// + /// 1正常0已结束 + /// + public Int32? State { get; set; } + public List ListModel { get; set; } + } + public class TemuShopGoodActiveDetail + { + /// + /// Id + /// + public Int32? Id { get; set; } + /// + /// ActiveId + /// + public Int32? ActiveId { get; set; } + /// + /// OffNum + /// + public Decimal? OffNum { get; set; } + /// + /// SalePrice + /// + public Decimal? SalePrice { get; set; } + /// + /// ActiveNum + /// + public Int32? ActiveNum { get; set; } + /// + /// LeftNum + /// + public Int32? LeftNum { get; set; } + } } \ No newline at end of file diff --git a/TradeManageNew/TradeManageNew.csproj b/TradeManageNew/TradeManageNew.csproj index 002d58b..3da2a77 100644 --- a/TradeManageNew/TradeManageNew.csproj +++ b/TradeManageNew/TradeManageNew.csproj @@ -1427,6 +1427,7 @@ + @@ -2872,6 +2873,13 @@ TemuShopGoodPriceCheck.aspx + + TemuShopGoodPriceNew.aspx + ASPXCodeBehind + + + TemuShopGoodPriceNew.aspx + IndexErp.aspx diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index 0da34d6..53cc0c9 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index bc75fe6..81461a3 100644 Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll index 0da34d6..53cc0c9 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb index bc75fe6..81461a3 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ