diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index c390b14..d0821f2 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 344ee4e..3e84111 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -30478,6 +30478,15 @@ namespace TradeManageNew return true; } #endregion + #region 结束活动 + [WebMethod(EnableSession = true)] + public bool Update_TemuShopGoodActive(int ID) + { + PagesNew.Login(this.Session); + DataNew.Update_TemuShopGoodActive(ID); + return true; + } + #endregion #region 返回Model [WebMethod(EnableSession = true)] public TemuShopGoodActive GetModel_TemuShopGoodActive(int ID) @@ -30528,7 +30537,37 @@ namespace TradeManageNew int RowCount = 0; resultModel.DataSource = DataNew.GetListTemuShopGoodActive(where, PageIndex, PageSize, "", out RowCount); resultModel.RowCount = RowCount; - return resultModel; + + string ids = ""; + if (resultModel.DataSource != null) + { + foreach (var omd in resultModel.DataSource) + { + ids += omd.ID + ","; + } + ids = ids.TrimEnd(','); + if (ids != "") + { + var dlist = DataNew.GetListTemuShopGoodActiveDetail(ids); + if (dlist != null) + { + foreach (var omd in resultModel.DataSource) + { + string ActiveInfo = ""; + var dmd = dlist.FindAll(n => n.ActiveId == omd.ID); + if (dmd != null) + { + foreach (var ddmd in dmd) + { + ActiveInfo +="折扣："+ddmd.OffNum.Value.ToString() + " 售价："+ ddmd.SalePrice.Value.ToString() + " 活动库存："+ ddmd.ActiveNum.Value.ToString() + " 已出订单："+ ddmd.OutNum.Value.ToString() + "
"; + } + } + } + } + } + } + + return resultModel; } #endregion diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index db7738c..887eb13 100644 --- a/TradeManageNew/DataNew.cs +++ b/TradeManageNew/DataNew.cs @@ -30873,16 +30873,17 @@ select @ID"; 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)"; + tsql = @"INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[OutNum])values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@OutNum)"; cmd = db.GetSqlStringCommand(tsql); foreach (var item in Model.ListModel) { cmd.Parameters.Clear(); + item.OutNum = 0; 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.AddInParameter(cmd, "@OutNum", DbType.Int32, item.OutNum); db.ExecuteNonQuery(cmd); } return a; @@ -30900,6 +30901,18 @@ select @ID"; db.ExecuteNonQuery(cmd); } #endregion + + #region 删除 + public static void Update_TemuShopGoodActive(int ID) + { + string tsql = @" + update TemuShopGoodActive set state=0 where ID=@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) { @@ -30990,13 +31003,25 @@ delete from TemuShopGoodActiveDetail where Id=@Id"; return ListModel; } #endregion - + #region 返回列表 + public static List GetListTemuShopGoodActiveDetail(string ids) + { + //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 TemuShopGoodActiveDetail where ActiveId in (" + ids+")"; + 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 = @"select ID=cast(a.ID as int),a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State,b.ShopName from TemuShopGoodActive a +left Join JC_Shop b on a.Shopid = b.Shopid"; ser.Tsql += " " + ser.Filter(where); ser.PageIndex = PageIndex; ser.PageSize = PageSize; diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx index d3efea2..44b0b15 100644 --- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx +++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx @@ -6,135 +6,209 @@ - Temu店铺商品售价 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - -
- Temu店铺活动 -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- *店铺： - - *SKU： - - -
- *SPUID： - - - - *基础价格： - - -
- *预估运费： - - - - - - -
- -
-
-
- - - + + + +
+ + + + + + + + + + + + + + + + + + + + - - - - - - - - + - - - - +
店铺SKU状态
店铺：SKU/SPUID： + +
- -   -   -   + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + +
店铺SKUSPUID
基础价格
+ +
-
- + 		+
+ + + +
+ +
+
+ diff --git a/TradeManageNew/ModelNew.cs b/TradeManageNew/ModelNew.cs index 5099fbf..727ee4c 100644 --- a/TradeManageNew/ModelNew.cs +++ b/TradeManageNew/ModelNew.cs @@ -11274,10 +11274,13 @@ namespace TradeManageNew /// Shopid /// public Int32? Shopid { get; set; } + public String ShopName { get; set; } /// /// SKU /// public String SKU { get; set; } + + public String ActiveInfo { get; set; } /// /// SPUID /// @@ -11329,6 +11332,6 @@ namespace TradeManageNew /// /// LeftNum /// - public Int32? LeftNum { get; set; } + public Int32? OutNum { get; set; } } } \ No newline at end of file diff --git a/TradeManageNew/Web.config b/TradeManageNew/Web.config index 66850e4..4b0b07e 100644 --- a/TradeManageNew/Web.config +++ b/TradeManageNew/Web.config @@ -63,11 +63,11 @@ - + - + diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index 53cc0c9..d0821f2 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.dll.config b/TradeManageNew/bin/TradeManageNew.dll.config index 66850e4..4b0b07e 100644 --- a/TradeManageNew/bin/TradeManageNew.dll.config +++ b/TradeManageNew/bin/TradeManageNew.dll.config @@ -63,11 +63,11 @@ - + - + diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index 81461a3..dfe5154 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 53cc0c9..d0821f2 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 81461a3..dfe5154 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ