From e369db4b6ee5efcf6e7c42c4b49cf2380f3b8beb Mon Sep 17 00:00:00 2001 From: lym <16170814@qq.com> Date: Mon, 30 Mar 2026 23:18:01 +0800 Subject: [PATCH] =?UTF-8?q?3=E6=9C=8830=E6=97=A5=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mtxfw.DAL/MemberStatistics_huiyuan.cs | 4 ++-- Mtxfw.DAL/order_info.cs | 9 ++++++--- Mtxfw.VipSite/App_Data/Config.xml | 4 ++-- Mtxfw.VipSite/xapiajax.ashx.cs | 21 ++++++++++++++++++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Mtxfw.DAL/MemberStatistics_huiyuan.cs b/Mtxfw.DAL/MemberStatistics_huiyuan.cs index 9b7d4c1..a54adcc 100644 --- a/Mtxfw.DAL/MemberStatistics_huiyuan.cs +++ b/Mtxfw.DAL/MemberStatistics_huiyuan.cs @@ -148,8 +148,8 @@ namespace Mtxfw.DAL { //获取直接推荐人的等级 ContactLevel = YuLevel; - //直接推荐人，且大于普通会员级别 - if (YuLevel > 0) + //直接推荐人，且大于普通会员级别，且只有热卖商品（非会员商城），且支付金额大于等于2000 + if (YuLevel > 0 && ttype ==0 && pv>=2000) { //计算佣金 YongJinJS(config, umodel, ds.Tables[0].Rows[0], YContactID, YContactIDS, pv, xfz, yfbl, ttype); diff --git a/Mtxfw.DAL/order_info.cs b/Mtxfw.DAL/order_info.cs index 453ab38..8a664a4 100644 --- a/Mtxfw.DAL/order_info.cs +++ b/Mtxfw.DAL/order_info.cs @@ -22,9 +22,9 @@ namespace Mtxfw.DAL { StringBuilder strSql = new StringBuilder(); strSql.Append("insert into order_info("); - strSql.Append("pid,poid,pcount,ypcount,addressid,orderid,selcolor,guige,Contactname,Contacttel,Province,City,County,IFFill,Tradingarea,Address,Zipcode,Guests,Totalprice,JFTotalprice,Totalprice0,Totalprice1,Totalprice2,Totalprice3,Totalprice4,Totalprice5,Totalprice6,Totalprice7,Totalprice8,Totalprice9,Totalprice10,Totalnum,O_Submit,O_yhj,UserID,MemberId,ZTMemberId,utype,ttype,ttype0,ptype,ptgroup,ifxnhy,ypznum,ifxhpt,peitype,gtype)"); + strSql.Append("pid,poid,pcount,ypcount,addressid,orderid,selcolor,guige,Contactname,Contacttel,Province,City,County,IFFill,Tradingarea,Address,Zipcode,Guests,Totalprice,JFTotalprice,Totalprice0,Totalprice1,Totalprice2,Totalprice3,Totalprice4,Totalprice5,Totalprice6,Totalprice7,Totalprice8,Totalprice9,Totalprice10,Totalnum,O_Submit,O_yhj,UserID,MemberId,ZTMemberId,utype,ttype,ttype0,ptype,ptgroup,ifxnhy,ypznum,ifxhpt,peitype,gtype,orderhxm)"); strSql.Append(" values ("); - strSql.Append("@pid,@poid,@pcount,@ypcount,@addressid,@orderid,@selcolor,@guige,@Contactname,@Contacttel,@Province,@City,@County,@IFFill,@Tradingarea,@Address,@Zipcode,@Guests,@Totalprice,@JFTotalprice,@Totalprice0,@Totalprice1,@Totalprice2,@Totalprice3,@Totalprice4,@Totalprice5,@Totalprice6,@Totalprice7,@Totalprice8,@Totalprice9,@Totalprice10,@Totalnum,@O_Submit,@O_yhj,@UserID,@MemberId,@ZTMemberId,@utype,@ttype,@ttype0,@ptype,@ptgroup,@ifxnhy,@ypznum,@ifxhpt,@peitype,@gtype)"); + strSql.Append("@pid,@poid,@pcount,@ypcount,@addressid,@orderid,@selcolor,@guige,@Contactname,@Contacttel,@Province,@City,@County,@IFFill,@Tradingarea,@Address,@Zipcode,@Guests,@Totalprice,@JFTotalprice,@Totalprice0,@Totalprice1,@Totalprice2,@Totalprice3,@Totalprice4,@Totalprice5,@Totalprice6,@Totalprice7,@Totalprice8,@Totalprice9,@Totalprice10,@Totalnum,@O_Submit,@O_yhj,@UserID,@MemberId,@ZTMemberId,@utype,@ttype,@ttype0,@ptype,@ptgroup,@ifxnhy,@ypznum,@ifxhpt,@peitype,@gtype,@orderhxm)"); strSql.Append(";select SCOPE_IDENTITY()"); SqlParameter[] parameters = { new SqlParameter("@pid", SqlDbType.Int), @@ -73,7 +73,9 @@ namespace Mtxfw.DAL new SqlParameter("@ypznum", SqlDbType.Int), new SqlParameter("@ifxhpt", SqlDbType.Int), new SqlParameter("@peitype", SqlDbType.Int), - new SqlParameter("@gtype", SqlDbType.Int)}; + new SqlParameter("@gtype", SqlDbType.Int), + new SqlParameter("@orderhxm", SqlDbType.VarChar,50)}; + parameters[0].Value = model.pid; parameters[1].Value = model.poid; parameters[2].Value = model.pcount; @@ -121,6 +123,7 @@ namespace Mtxfw.DAL parameters[44].Value = model.ifxhpt; parameters[45].Value = model.peitype; parameters[46].Value = model.gtype; + parameters[47].Value = model.orderhxm; object obj = Mtxfw.Utility.SqlDbHelper_U.GetObject(strSql.ToString(), parameters); if (obj.ToString() == "") { diff --git a/Mtxfw.VipSite/App_Data/Config.xml b/Mtxfw.VipSite/App_Data/Config.xml index 1d336ed..f7a6159 100644 --- a/Mtxfw.VipSite/App_Data/Config.xml +++ b/Mtxfw.VipSite/App_Data/Config.xml @@ -229,8 +229,8 @@ - - + + diff --git a/Mtxfw.VipSite/xapiajax.ashx.cs b/Mtxfw.VipSite/xapiajax.ashx.cs index b2ef888..a0a0183 100644 --- a/Mtxfw.VipSite/xapiajax.ashx.cs +++ b/Mtxfw.VipSite/xapiajax.ashx.cs @@ -3052,7 +3052,8 @@ namespace Mtxfw.VipSite County = model.CompanyCounty; address = model.Companyaddress; } - data = "{\"status\":1,\"msg\":\"获取成功！\",\"user\":{\"utype\":\"" + model.utype + "\",\"avatar\":\"" + (model.UserPic == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(model.UserPic, "100x100", "cut")) + "\",\"yavatar\":\"" + model.UserPic + "\",\"username\":\"" + model.UserName + "\",\"realname\":\"" + model.RealName + "\",\"ncname\":\"" + model.NCName + "\",\"address\":\"" + address + "\",\"phone\":\"" + model.Phone + "\",\"sfz\":\"" + model.SFZ + "\",\"accountname\":\"" + model.ProductName + "\",\"bankname\":\"" + model.RealName2 + "\",\"bankcard\":\"" + model.Phone2 + "\",\"bankaddress\":\"" + model.PostalCode + "\",\"AliAccount\":\"" + model.AliAccount + "\",\"AliName\":\"" + model.AliName + "\",\"aliimage\":\"" + (model.aliimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.aliimage)) + "\",\"weixinimage\":\"" + (model.weixinimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.weixinimage)) + "\",\"yaliimage\":\"" + model.aliimage + "\",\"yweixinimage\":\"" + model.weixinimage + "\",\"CompanyName\":\"" + model.CompanyName + "\",\"CompanyNumber\":\"" + model.CompanyNumber + "\",\"CompanyCert\":\"\",\"CompanyPic\":\"\",\"yCompanyCert\":\"\",\"yCompanyPic\":\"\",\"Province\":\"" + Province + "\",\"City\":\"" + City + "\",\"County\":\"" + County + "\",\"latitude\":\"" + model.latitude + "\",\"longitude\":\"" + model.longitude + "\"},\"webbank\":\"" + config.webbank + "\"}"; + //data = "{\"status\":1,\"msg\":\"获取成功！\",\"user\":{\"utype\":\"" + model.utype + "\",\"avatar\":\"" + (model.UserPic == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(model.UserPic, "100x100", "cut")) + "\",\"yavatar\":\"" + model.UserPic + "\",\"username\":\"" + model.UserName + "\",\"realname\":\"" + model.RealName + "\",\"ncname\":\"" + model.NCName + "\",\"address\":\"" + address + "\",\"phone\":\"" + model.Phone + "\",\"sfz\":\"" + model.SFZ + "\",\"accountname\":\"" + model.ProductName + "\",\"bankname\":\"" + model.RealName2 + "\",\"bankcard\":\"" + model.Phone2 + "\",\"bankaddress\":\"" + model.PostalCode + "\",\"AliAccount\":\"" + model.AliAccount + "\",\"AliName\":\"" + model.AliName + "\",\"aliimage\":\"" + (model.aliimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.aliimage)) + "\",\"weixinimage\":\"" + (model.weixinimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.weixinimage)) + "\",\"yaliimage\":\"" + model.aliimage + "\",\"yweixinimage\":\"" + model.weixinimage + "\",\"CompanyName\":\"" + model.CompanyName + "\",\"CompanyNumber\":\"" + model.CompanyNumber + "\",\"CompanyCert\":\"\",\"CompanyPic\":\"\",\"yCompanyCert\":\"\",\"yCompanyPic\":\"\",\"Province\":\"" + Province + "\",\"City\":\"" + City + "\",\"County\":\"" + County + "\",\"latitude\":\"" + model.latitude + "\",\"longitude\":\"" + model.longitude + "\"},\"webbank\":\"" + config.webbank + "\"}"; + data = "{\"status\":1,\"msg\":\"获取成功！\",\"user\":{\"utype\":\"" + model.utype + "\",\"avatar\":\"" + model.UserPic + "\",\"yavatar\":\"" + model.UserPic + "\",\"username\":\"" + model.UserName + "\",\"realname\":\"" + model.RealName + "\",\"ncname\":\"" + model.NCName + "\",\"address\":\"" + address + "\",\"phone\":\"" + model.Phone + "\",\"sfz\":\"" + model.SFZ + "\",\"accountname\":\"" + model.ProductName + "\",\"bankname\":\"" + model.RealName2 + "\",\"bankcard\":\"" + model.Phone2 + "\",\"bankaddress\":\"" + model.PostalCode + "\",\"AliAccount\":\"" + model.AliAccount + "\",\"AliName\":\"" + model.AliName + "\",\"aliimage\":\"" + (model.aliimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.aliimage)) + "\",\"weixinimage\":\"" + (model.weixinimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(model.weixinimage)) + "\",\"yaliimage\":\"" + model.aliimage + "\",\"yweixinimage\":\"" + model.weixinimage + "\",\"CompanyName\":\"" + model.CompanyName + "\",\"CompanyNumber\":\"" + model.CompanyNumber + "\",\"CompanyCert\":\"\",\"CompanyPic\":\"\",\"yCompanyCert\":\"\",\"yCompanyPic\":\"\",\"Province\":\"" + Province + "\",\"City\":\"" + City + "\",\"County\":\"" + County + "\",\"latitude\":\"" + model.latitude + "\",\"longitude\":\"" + model.longitude + "\"},\"webbank\":\"" + config.webbank + "\"}"; } } else @@ -12999,8 +13000,18 @@ namespace Mtxfw.VipSite strdata += "\"pic\":["; string showpic = (pics[0].Split(',')[0].IndexOf("http") != -1 ? pics[0].Split(',')[0] : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(pics[0].Split(',')[0], "150x150", "cut")); int j = 0; + int inx = 0; foreach (string str in pics) { + if (pics.Length > 2) + { + if (inx == 0) + { + inx++; + continue; + } + } + inx++; if (str != "") { string[] stra = str.Split(','); @@ -15293,7 +15304,7 @@ namespace Mtxfw.VipSite if (!String.IsNullOrEmpty(context.Request["agentid"])) { agentid = Convert.ToInt32(context.Request["agentid"].ToString()); - orderhxm = orderhxm = GenerateRandomString(6); + if (!String.IsNullOrEmpty(context.Request["agenttype"])) { agenttype = Convert.ToInt32(context.Request["agenttype"].ToString()); @@ -16346,7 +16357,11 @@ namespace Mtxfw.VipSite } } } - + orderhxm = orderhxm = GenerateRandomString(6); + if (string.IsNullOrWhiteSpace(orderhxm)) + { + orderhxm = DateTime.Now.ToString("yyyyMMddHHmmss"); + } Model.order_info Modelorder = new Model.order_info(); Modelorder.pid = prodid; Modelorder.poid = (utype == 6 ? poid : 0);