分配模式提交

Mtxfw.DAL/MemberStatistics_huiyuan.cs

@@ -205,6 +205,7 @@ namespace Mtxfw.DAL
                     var uplevel2_amount = config.direct_upgrade_level2_amount_condition;
                     var uplevel3_amount = config.direct_upgrade_level3_amount_condition;
                     var uplevel4_amount = config.direct_upgrade_level4_amount_condition;
+                    var uplevel5_amount = config.direct_upgrade_level5_amount_condition;
                     if (duLevel < ptype)
                     {
                         var flag = daoUser.UpdateuLevel("uLevel", ptype, dID);
@@ -237,6 +238,11 @@ namespace Mtxfw.DAL
                         var flag =  daoUser.UpdateuLevel("uLevel", 4, dID);
                         return flag ? 4 : 0;
                     }
+                    else if (uplevel5_amount > 0 && pv >= uplevel5_amount && duLevel < 4)
+                    {
+                        var flag = daoUser.UpdateuLevel("uLevel", 5, dID);
+                        return flag ? 3 : 0;
+                    }
 
                 }
             }
@@ -294,10 +300,10 @@ namespace Mtxfw.DAL
                 }
                 if (umodel != null)
                 {   
-                    var uplevel2_amount = config.upgrade_level2_amount_condition;
+                    var uplevel5_amount = config.upgrade_level5_amount_condition;
                     var uplevel3_amount = config.upgrade_level3_amount_condition;
                     var uplevel4_amount = config.upgrade_level4_amount_condition;
-                    var upgrade_level2 = config.upgrade_level2_person_condition;
+                    var upgrade_level5 = config.upgrade_level5_person_condition;
                     var upgrade_level3 = config.upgrade_level3_person_condition;
                     var upgrade_level4 = config.upgrade_level4_person_condition;
                     var umoneyyjze = umodel.umoney18;
@@ -307,47 +313,32 @@ namespace Mtxfw.DAL
                     var tjcount = 0;
                     switch (selflevel)
                     {
-                        case 1:
+                        //case 2:
-                            if (rowlevel == 1)
+                        //    if (rowlevel == 2)
-                            {
+                        //    {
-                                // rowlevel是否升到2级的条件
+                        //        // rowlevel是否升到2级的条件
-                                if (uplevel2_amount>0 && upgrade_level2>0)
+                        //        if (uplevel2_amount>0 && upgrade_level2>0)
-                                {
+                        //        {
-                                     tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
+                        //             tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
-                                    if (tjcount >= upgrade_level2 && umoneyyjze >= uplevel2_amount)
+                        //            if (tjcount >= upgrade_level2 && umoneyyjze >= uplevel2_amount)
-                                    {
+                        //            {
-                                        uplevel = 2;
+                        //                uplevel = 2;
-                                    }
+                        //            }
-                                }
+                        //        }
                                 
-                            }
+                        //    }
-                            break;
+                        //    break;
-                        case 2:
-                            //
-                            if (rowlevel == 2)
-                            {
-                                // rowlevel是否升到3级的条件
-                                if (uplevel2_amount > 0 && upgrade_level2 > 0)
-                                {
-                                    tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
-                                    if (tjcount >= upgrade_level2 && umoneyyjze >= uplevel2_amount)
-                                    {
-                                        uplevel = 3;
-                                    }
-                                }
-                                
-                            }
-                            break;
                         case 3:
+                            //
                             if (rowlevel == 3)
                             {
-                                // rowlevel是否升到4级的条件
+                                // rowlevel是否升到3级的条件
-                                if (uplevel2_amount > 0 && upgrade_level2 > 0)
+                                if (uplevel3_amount > 0 && upgrade_level3 > 0)
                                 {
                                     tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
-                                    if (tjcount >= upgrade_level2 && umoneyyjze >= uplevel2_amount)
+                                    if (tjcount >= upgrade_level3 && umoneyyjze >= uplevel3_amount)
                                     {
-                                        uplevel = 4;
+                                        uplevel = 3;
                                     }
                                 }
                                 
@@ -356,11 +347,26 @@ namespace Mtxfw.DAL
                         case 4:
                             if (rowlevel == 4)
                             {
-                                // rowlevel是否升到5级的条件
+                                // rowlevel是否升到4级的条件
-                                if (uplevel2_amount > 0 && upgrade_level2 > 0)
+                                if (uplevel4_amount > 0 && upgrade_level4 > 0)
                                 {
                                     tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
-                                    if (tjcount >= upgrade_level2 && umoneyyjze >= uplevel2_amount)
+                                    if (tjcount >= upgrade_level4 && umoneyyjze >= uplevel4_amount)
+                                    {
+                                        uplevel = 4;
+                                    }
+                                }
+                                
+                            }
+                            break;
+                        case 5:
+                            if (rowlevel == 4)
+                            {
+                                // rowlevel是否升到5级的条件
+                                if (uplevel5_amount > 0 && upgrade_level5 > 0)
+                                {
+                                    tjcount = daoUser.GetCount("gtype=" + gtype + " and IFStores=0 And userstate='正常'  and ContactID=" + rowid + " and uLevel=" + rowlevel + "");
+                                    if (tjcount >= upgrade_level5 && umoneyyjze >= uplevel5_amount)
                                     {
                                         uplevel = 5;
                                     }
@@ -941,6 +947,7 @@ namespace Mtxfw.DAL
             double result = yfbl;
             try 
             {
+   
                 int dID = Convert.ToInt32(ContactRow["ID"].ToString());
                 //Yumoney17就是余额，而且写成负数
                 Double Yumoney17 = Convert.ToDouble(Convert.ToDouble(ContactRow["umoney17"]).ToString("f4"));
@@ -1070,6 +1077,12 @@ namespace Mtxfw.DAL
             double result = yfbl;
             try
             {
+                var uplevel2_amount = config.direct_upgrade_level2_amount_condition;
+                ///热卖商品只有到达升级到2级金额的才能拿佣金
+                if (pv < uplevel2_amount)
+                {
+                    result = 0;
+                }
                 int dID = Convert.ToInt32(ContactRow["ID"].ToString());
                 //Yumoney17就是余额，而且写成负数
                 Double Yumoney17 = Convert.ToDouble(Convert.ToDouble(ContactRow["umoney17"]).ToString("f4"));

Mtxfw.Utility/Common.cs

@@ -1980,12 +1980,13 @@ namespace Mtxfw.Utility
         {
             Dictionary<int, string> dic = new Dictionary<int, string>();
             dic.Add(0, "普通会员");
-            dic.Add(1, "健康大使");
+            dic.Add(1, "准健康大使");
-            dic.Add(2, "健康合伙人");
+            dic.Add(2, "健康大使");
-            dic.Add(3, "健康执行官");
+            dic.Add(3, "健康合伙人");
-            dic.Add(4, "健康守护者");
+            dic.Add(4, "健康执行官");
-            dic.Add(5, "");
+            dic.Add(5, "健康守护者");
             dic.Add(6, "");
+            dic.Add(7, "");
             return dic;
         }
 

Mtxfw.Utility/Config.cs

@@ -2371,7 +2371,7 @@ namespace Mtxfw.Utility
         }
 
         /// <summary>
-        /// 等级0的直接上级奖金比例
+        /// 等级0的直接上级奖金比例(业务佣金)
         /// </summary>
         public Double level0_direct_superior_bonus_ratio
         {
@@ -2440,18 +2440,33 @@ namespace Mtxfw.Utility
             { setData("level4_fixed_bonus", value.ToString()); }
         }
 
+
         /// <summary>
-        /// 升级到等级2的金额条件
+        /// 等级5的最大奖金比例
         /// </summary>
-        public Double upgrade_level2_amount_condition
+        public Double level5_fixed_bonus
+        {
+            get
+            {
+                string value = getData("level5_fixed_bonus");
+                return string.IsNullOrEmpty(value) ? 0 : double.Parse(value);
+            }
+            set
+            { setData("level5_fixed_bonus", value.ToString()); }
+        }
+
+        /// <summary>
+        /// 升级到等级5的金额条件
+        /// </summary>
+        public Double upgrade_level5_amount_condition
         {
             get
             { 
-                string value = getData("upgrade_level2_amount_condition");
+                string value = getData("upgrade_level5_amount_condition");
                 return string.IsNullOrEmpty(value) ? 0 : double.Parse(value); 
             }
             set
-            { setData("upgrade_level2_amount_condition", value.ToString()); }
+            { setData("upgrade_level5_amount_condition", value.ToString()); }
         }
 
         /// <summary>
@@ -2483,17 +2498,17 @@ namespace Mtxfw.Utility
         }
 
         /// <summary>
-        /// 升级到等级2的拉人条件
+        /// 升级到等级5的拉人条件
         /// </summary>
-        public int upgrade_level2_person_condition
+        public int upgrade_level5_person_condition
         {
             get
             { 
-                string value = getData("upgrade_level2_person_condition");
+                string value = getData("upgrade_level5_person_condition");
                 return string.IsNullOrEmpty(value) ? 0 : int.Parse(value); 
             }
             set
-            { setData("upgrade_level2_person_condition", value.ToString()); }
+            { setData("upgrade_level5_person_condition", value.ToString()); }
         }
 
         /// <summary>
@@ -2579,6 +2594,36 @@ namespace Mtxfw.Utility
             set
             { setData("direct_upgrade_level4_amount_condition", value.ToString()); }
         }
+
+        /// <summary>
+        /// 直接升级到等级5的金额条件
+        /// </summary>
+        public Double direct_upgrade_level5_amount_condition
+        {
+            get
+            {
+                string value = getData("direct_upgrade_level5_amount_condition");
+                return string.IsNullOrEmpty(value) ? 0 : double.Parse(value);
+            }
+            set
+            { setData("direct_upgrade_level5_amount_condition", value.ToString()); }
+        }
+
+        /// <summary>
+        /// 赠送兑换卷值
+        /// </summary>
+        public Double vouchervalue
+        {
+            get
+            {
+                string value = getData("vouchervalue");
+                return string.IsNullOrEmpty(value) ? 0 : double.Parse(value);
+            }
+
+            set
+            { setData("vouchervalue", value.ToString()); }
+        }
+
         public string webMoney153
         {
             get

Mtxfw.VipSite/Admin_Member_Products.aspx

@@ -133,7 +133,7 @@
           <th width="50"><b>选择</b></th>
           <%} %>
         <th width="350"><b>商品</b></th>
-        <th width="250"><b>兑换值/库存</b></th>
+        <th width="250"><b>金额/库存</b></th>
         <th><b>排序ID</b></th>
         <th><b>添加时间</b></th>
         <th><b>状态</b></th>

Mtxfw.VipSite/Admin_Member_Products.aspx.cs

@@ -404,8 +404,10 @@ namespace Mtxfw.VipSite
                     string G_Name = Dr["G_Name"].ToString();
                     Double G_JG = Double.Parse(Dr["G_JG"].ToString());
                     Double G_JF = Double.Parse(Dr["G_JF"].ToString());
+                    Double G_JG2 = Double.Parse(Dr["G_JG2"].ToString());
+                    Double G_JG4 = Double.Parse(Dr["G_JG4"].ToString());
                     int G_KC = int.Parse(Dr["G_KC"].ToString());
-                    strje += G_Name + "&nbsp;" + "价格"+G_JG + "+兑换券" + G_JF + "/库存" + G_KC + "<br>";
+                    strje += G_Name + "&nbsp;" + "价格"+G_JG + "+消费值" + G_JG4 + "/库存" + G_KC + "<br>";
                 }
                 strje += "</td>";
             }

Mtxfw.VipSite/Admin_Member_Products.aspx.designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <自动生成>
-//     This code was generated by a tool.
+//     此代码由工具生成。
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
+//     对此文件的更改可能导致不正确的行为，如果
-//     the code is regenerated. 
+//     重新生成代码，则所做更改将丢失。
-// </auto-generated>
+// </自动生成>
 //------------------------------------------------------------------------------
 
 namespace Mtxfw.VipSite
@@ -15,65 +15,65 @@ namespace Mtxfw.VipSite
     {
 
         /// <summary>
-        /// Head1 control.
+        /// Head1 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
 
         /// <summary>
-        /// Drop_Cls control.
+        /// Drop_Cls 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList Drop_Cls;
 
         /// <summary>
-        /// Drop_State control.
+        /// Drop_State 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList Drop_State;
 
         /// <summary>
-        /// Repeater1 control.
+        /// Repeater1 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater Repeater1;
 
         /// <summary>
-        /// seclect_Drop control.
+        /// seclect_Drop 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList seclect_Drop;
 
         /// <summary>
-        /// Btn_Run control.
+        /// Btn_Run 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button Btn_Run;
 
         /// <summary>
-        /// MyPager control.
+        /// MyPager 控件。
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
+        /// 自动生成的字段。
-        /// To modify move field declaration from designer file to code-behind file.
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::Wuqi.Webdiyer.AspNetPager MyPager;
     }

Mtxfw.VipSite/Admin_Member_Products_add.aspx

@@ -532,7 +532,7 @@
         var len = 1;
         function onaddgg() {//<li class="textjg"><input id="textjg3" type="text" /></li><li><input id="textjg0" type="text" /></li><li><input id="textjg1" type="text" /></li><li><input id="textjf" type="text" /></li>
             //var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg2"><input id="textjg2" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg0" type="text" /></li><li class="textjg"><input id="textjg1" type="text" /></li>';
-            var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjf" type="text" /></li>';
+            var html = '<ul class="addggbox_box" id="addggbox_box' + len + '"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li></li><li class="textjg"><input id="textjg4" type="text" /></li>';
 
 			
            
@@ -568,18 +568,18 @@
                 var images = $("#addggbox_box" + id + " .texttp").attr("tps");
                 var gg=fTrim($("#addggbox_box" + id + " #textgg").val());
                 var jg = fTrim($("#addggbox_box" + id + " #textjg").val());
-                var jg2 = "";// fTrim($("#addggbox_box" + id + " #textjg2").val());
+                var jg2 = fTrim($("#addggbox_box" + id + " #textjg2").val());
 				 
                 var jg1 = "";// fTrim($("#addggbox_box" + id + " #textjg1").val());
                 var jg3 = "";// fTrim($("#addggbox_box" + id + " #textjg3").val());
-				var jg4 = "";
+                var jg4 = fTrim($("#addggbox_box" + id + " #textjg4").val());
 				var jg5 = "";
 				var jg6 = "";
 
                 jg0 = "";// fTrim($("#addggbox_box" + id + " #textjg0").val());
 				//jg4 = fTrim($("#addggbox_box" + id + " #textjg4").val());
                 
-				var jf =fTrim($("#addggbox_box" + id + " #textjf").val());
+                var jf = "0";// fTrim($("#addggbox_box" + id + " #textjf").val());
                 
                
                 var zl=fTrim($("#addggbox_box" + id + " #textzl").val());
@@ -589,12 +589,18 @@
                     b = false;
                     alert("规格名称不能为空")
                 }
-                <%--if (b) {
+                if (b) {
                     if (jg2 == "") {
                         b = false;
                         alert("零售价不能为空")
                     }
-                }--%>
+                }
+                if (b) {
+                    if (jg4 == "") {
+                        b = false;
+                        alert("消费值不能为空")
+                    }
+                }
                 if (b) {
                     if (jg == "") {
                         b = false;
@@ -1074,13 +1080,14 @@
         <td>
           
             <div class="addggbox">
-            <ul class="addggbox_title"><li class="textgg">规格</li><!--<li>零售价</li>--><li>售价</li><li>优惠券</li>
+            <ul class="addggbox_title"><li class="textgg">规格</li><!--<li>零售价</li>--><li>售价</li><li>零售价</li><li>消费值</li>
               
                 <li>重量</li><li>库存</li><li>颜色</li><li>图片</li><li class="textcz"><input id="addbtn" class="abtn" type="button" value="添加" onclick="onaddgg()" /></li></ul>
             <%=guige%>
             <%if (guige == "")
               {%>
-            <ul class="addggbox_box" id="addggbox_box0"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjf" type="text" /></li>
+            <ul class="addggbox_box" id="addggbox_box0"><li class="textgg"><input id="textgg" type="text" /></li><li class="textjg"><input id="textjg" type="text" /></li><li class="textjg"><input id="textjg2" type="text" /></li><li class="textjg"><input id="textjg4" type="text" /></li>
+
 
                 <li class="textzl"><input id="textzl" type="text" /></li><li class="textkc"><input id="textkc" type="text" /></li><li class="textcolor" colors="" onclick="showcolor(0)">#颜色#</li><li class="texttp"  tps="" onclick="showtp(0)">#图片#</li><li class="textcz"><input id="editbtn" class="abtn" type="button" value="保存" onclick="showedit(0)" /><input id="delbtn" class="abtn" type="button" value="删除" onclick="ondelgg(0)" /><input id="ggids" type="hidden" value="" runat="server" /></li></ul>
             <%} %>

Mtxfw.VipSite/Admin_Member_Products_add.aspx.cs

@@ -107,7 +107,7 @@ namespace Mtxfw.VipSite
                         string tps = Dr["G_Images"].ToString();
                         //guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\" style=\"display:none;\"><input id=\"textjg2\" type=\"text\"value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg\" type=\"text\" value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg0\" type=\"text\" value=\"" + G_JG0 + "\" /></li><li class=\"textjg\"><input id=\"textjg1\" type=\"text\" value=\"" + G_JG1 + "\" /></li>";
                         //guige += "<li class=\"textzl\"><input id=\"textzl\" type=\"text\" value=\"" + G_ZL + "\" /></li><li class=\"textkc\"><input id=\"textkc\" type=\"text\" value=\"" + G_KC + "\" /></li><li class=\"textcolor\" colors=\"" + colors + "\" onclick=\"showcolor(" + G_ID + ")\">#颜色#</li><li class=\"texttp\" tps=\"" + tps + "\" onclick=\"showtp(" + G_ID + ")\">#图片#</li><li class=\"textcz\"><input id=\"editbtn\" class=\"abtn\" onclick=\"showedit(" + G_ID + ")\" type=\"button\" value=\"编辑\" /><input id=\"delbtn\" onclick=\"ondelgg(" + G_ID + ")\" class=\"abtn\" type=\"button\" value=\"删除\" /></li></ul>";
-                        guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjf\" type=\"text\" value=\"" + G_JF + "\" /></li>";
+                        guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg4\" type=\"text\" value=\"" + G_JG4 + "\" /></li>";
                         guige += "<li class=\"textzl\"><input id=\"textzl\" type=\"text\" value=\"" + G_ZL + "\" /></li><li class=\"textkc\"><input id=\"textkc\" type=\"text\" value=\"" + G_KC + "\" /></li><li class=\"textcolor\" colors=\"" + colors + "\" onclick=\"showcolor(" + G_ID + ")\">#颜色#</li><li class=\"texttp\" tps=\"" + tps + "\" onclick=\"showtp(" + G_ID + ")\">#图片#</li><li class=\"textcz\"><input id=\"editbtn\" class=\"abtn\" onclick=\"showedit(" + G_ID + ")\" type=\"button\" value=\"编辑\" /><input id=\"delbtn\" onclick=\"ondelgg(" + G_ID + ")\" class=\"abtn\" type=\"button\" value=\"删除\" /></li></ul>";
                     }
                 }
@@ -213,7 +213,7 @@ namespace Mtxfw.VipSite
                             int G_KC = int.Parse(Dr["G_KC"].ToString());
                             string colors = Dr["G_Color"].ToString();
                             string tps = Dr["G_Images"].ToString();
-                            guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjf\" type=\"text\" value=\"" + G_JF + "\" /></li>";
+                            guige += "<ul class=\"addggbox_box addggbox_boxed\" id=\"addggbox_box" + G_ID + "\"><li class=\"textgg\"><input id=\"textgg\" type=\"text\" value=\"" + G_Name + "\" /></li><li class=\"textjg2\"><input id=\"textjg\" type=\"text\"value=\"" + G_JG + "\" /></li><li class=\"textjg\"><input id=\"textjg2\" type=\"text\" value=\"" + G_JG2 + "\" /></li><li class=\"textjg\"><input id=\"textjg4\" type=\"text\" value=\"" + G_JG4 + "\" /></li>";
                        
 
                             guige += "<li class=\"textzl\"><input id=\"textzl\" type=\"text\" value=\"" + G_ZL + "\" /></li><li class=\"textkc\"><input id=\"textkc\" type=\"text\" value=\"" + G_KC + "\" /></li><li class=\"textcolor\" colors=\"" + colors + "\" onclick=\"showcolor(" + G_ID + ")\">#颜色#</li><li class=\"texttp\" tps=\"" + tps + "\" onclick=\"showtp(" + G_ID + ")\">#图片#</li><li class=\"textcz\"><input id=\"editbtn\" class=\"abtn\" onclick=\"showedit(" + G_ID + ")\" type=\"button\" value=\"编辑\" /><input id=\"delbtn\" onclick=\"ondelgg(" + G_ID + ")\" class=\"abtn\" type=\"button\" value=\"删除\" /></li></ul>";

Mtxfw.VipSite/App_Data/Config.xml

@@ -285,19 +285,22 @@
   <ReDataMM value="2022-09-16 20:41" des="刷新数据密码" />
   <IM_SDKAppID value="1600008672" des="即时通讯 IM SDKAppID" />
   <IM_SDKSecretkey value="f72a3331a005ffefc478a5605ad472ead8f4720eafcd33cf38329360446b4aca" des="即时通讯 IM Secretkey" />
-  <level1_fixed_bonus value="0.25" des="等级1的最大奖金比例" />
+  <level0_direct_superior_bonus_ratio value="0.25" des="等级0的直接上级奖金比例(业务佣金)" />
-  <level2_fixed_bonus value="0.45" des="等级2的最大奖金比例" />
+  <level1_fixed_bonus value="0" des="等级1的最大奖金比例" />
-  <level3_fixed_bonus value="0.55" des="等级3的最大奖金比例" />
+  <level2_fixed_bonus value="0.25" des="等级2的最大奖金比例" />
-  <level4_fixed_bonus value="0.65" des="等级4的最大奖金比例" />
+  <level3_fixed_bonus value="0.45" des="等级3的最大奖金比例" />
-  <upgrade_level2_amount_condition value="50000" des="升级到等级2的金额条件" />
+  <level4_fixed_bonus value="0.55" des="等级4的最大奖金比例" />
-  <upgrade_level3_amount_condition value="200000" des="升级到等级3的金额条件" />
+  <level5_fixed_bonus value="0.65" des="等级5的最大奖金比例" />
-  <upgrade_level4_amount_condition value="1000000" des="升级到等级4的金额条件" />
+  <upgrade_level3_amount_condition value="50000" des="升级到等级3的金额条件" />
-  <upgrade_level2_person_condition value="2" des="升级到等级2的拉人条件" />
+  <upgrade_level4_amount_condition value="200000" des="升级到等级4的金额条件" />
-  <upgrade_level3_person_condition value="4" des="升级到等级3的拉人条件" />
+  <upgrade_level5_amount_condition value="1000000" des="升级到等级5的金额条件" />
-  <upgrade_level4_person_condition value="8" des="升级到等级4的拉人条件" />
+  <upgrade_level3_person_condition value="2" des="升级到等级3的拉人条件" />
-  <direct_upgrade_level1_amount_condition value="1" des="直接升级到等级1的金额条件" />
+  <upgrade_level4_person_condition value="4" des="升级到等级4的拉人条件" />
-  <direct_upgrade_level2_amount_condition value="" des="直接升级到等级2的金额条件" />
+  <upgrade_level5_person_condition value="8" des="升级到等级5的拉人条件" />
-  <direct_upgrade_level3_amount_condition value="" des="直接升级到等级3的金额条件" />
+  <direct_upgrade_level1_amount_condition value="875" des="直接升级到等级1的金额条件" />
-  <direct_upgrade_level4_amount_condition value="" des="直接升级到等级4的金额条件" />
+  <direct_upgrade_level2_amount_condition value="2000" des="直接升级到等级2的金额条件" />
+  <direct_upgrade_level3_amount_condition value="0" des="直接升级到等级3的金额条件" />
+  <direct_upgrade_level4_amount_condition value="0" des="直接升级到等级4的金额条件" />
+  <direct_upgrade_level5_amount_condition value="0" des="直接升级到等级5的金额条件" />
   <vouchervalue value="800" des="赠送兑换卷值" />
 </config>

Mtxfw.VipSite/Css/smartadmin-production.css

@@ -1,19 +1,14 @@
     html {
 	margin: 0;
 	padding: 0;
-	height: 100%; overflow-y: auto;
-	
-	background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top;
-}
-        *html {
 	height: 100%;
+	overflow-y: auto;
 	background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top;
 }
 body {
 	margin: 0;
 	padding: 0;
 	height: 100%;
-	/*overflow: hidden;*/
 	background:#F2F2F2 url(leftnavbg.jpg) no-repeat left top;
 	direction: ltr
 }
@@ -23,7 +18,6 @@ body {
 	background: #4ce440;
 	padding: 0 13px;
 	width:100%;
-	
 	position: relative;
 }
 #ribbon .breadcrumb {
@@ -35,7 +29,7 @@ body {
 }
 #ribbon .breadcrumb a,#ribbon .breadcrumb {
 	color: #fff!important;
-	text-decoration: none!Important
+	text-decoration: none!important
 }
 .breadcrumb>li {
 display: inline-block;
@@ -43,18 +37,15 @@ text-shadow:none!important;padding-right:10px;
 }
 .breadcrumb li:after {content:"  > "}
 .breadcrumb li:last-child:after {content:""}
-#ribbon .breadcrumb>.active,#ribbon .breadcrumb li: last-child {
+#ribbon .breadcrumb>.active,#ribbon .breadcrumb li:last-child {
 	color: #E4E4E4
 }
 .btn {
 	border-radius: 2px;
 	-webkit-border-radius: 2px;
 	-moz-border-radius: 2px;
-/*	box-shadow: inset 0 -2px 0 rgba(0,0,0,.05);
-	-moz-box-shadow: inset 0 -2px 0 rgba(0,0,0,.05);
-	-webkit-box-shadow: inset 0 -2px 0 rgba(0,0,0,.05)*/
 }
-.btn: active {
+.btn:active {
 	position: relative;
 	top: 1px;
 	left: 1px
@@ -73,9 +64,8 @@ text-shadow:none!important;padding-right:10px;
 	margin: 0 8px 0 0;
 	cursor: pointer
 }
-.btn.btn-ribbon:hover
+.btn.btn-ribbon:hover {
-{
+	background-color:#2baa09;
-     background-color:#2baa09;
 }
 .btn.btn-ribbon>i {
 	font-size: 111%
@@ -123,11 +113,11 @@ text-shadow:none!important;padding-right:10px;
 	-moz-border-radius: 0;
 	-webkit-border-radius: 0
 }
-#shortcut ul li .jarvismetro-tile: hover {
+#shortcut ul li .jarvismetro-tile:hover {
 	color: #fff;
 	text-decoration: none
 }
-#shortcut ul li .jarvismetro-tile: active,#shortcut ul li .jarvismetro-tile: focus {
+#shortcut ul li .jarvismetro-tile:active,#shortcut ul li .jarvismetro-tile:focus {
 	left: 0;
 	top: 0
 }
@@ -148,7 +138,7 @@ text-shadow:none!important;padding-right:10px;
 	padding: 5px;
 	position: relative
 }
-.jarvismetro-tile: hover {
+.jarvismetro-tile:hover {
 	z-index: 10;
 	-webkit-transform: scale(1.07);
 	-moz-transform: scale(1.07)
@@ -160,7 +150,7 @@ text-shadow:none!important;padding-right:10px;
 .jarvismetro-tile.double {
 	width: 249px
 }
-.jarvismetro-tile: active {
+.jarvismetro-tile:active {
 	top: 1px;
 	left: 1px
 }
@@ -187,7 +177,7 @@ text-shadow:none!important;padding-right:10px;
 .selected {
 	border: 1px solid #0091d9!important
 }
-.selected: before {
+.selected::before {
 	display: block;
 	position: absolute;
 	content: "\f00c";
@@ -196,7 +186,7 @@ text-shadow:none!important;padding-right:10px;
 	font-family: FontAwesome;
 	z-index: 2
 }
-.selected: after {
+.selected::after {
 	width: 0;
 	height: 0;
 	border-top: 35px solid #0091d9;

Mtxfw.VipSite/Mtxfw.VipSite.csproj

@@ -212,6 +212,7 @@
     <Content Include="Admin_Member_JJXF2.aspx" />
     <Content Include="Admin_Member_JuBao.aspx" />
     <Content Include="Admin_Member_khjb.aspx" />
+    <Content Include="Admin_Member_LevelConfig.aspx" />
     <Content Include="Admin_Member_link.aspx" />
     <Content Include="Admin_Member_link_add.aspx" />
     <Content Include="Admin_Member_List.aspx" />
@@ -2722,6 +2723,13 @@
     <Compile Include="Admin_Member_khjb.aspx.designer.cs">
       <DependentUpon>Admin_Member_khjb.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Admin_Member_LevelConfig.aspx.cs">
+      <DependentUpon>Admin_Member_LevelConfig.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Admin_Member_LevelConfig.aspx.designer.cs">
+      <DependentUpon>Admin_Member_LevelConfig.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Admin_Member_link.aspx.cs">
       <DependentUpon>Admin_Member_link.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

Mtxfw.VipSite/Web.config

@@ -3,9 +3,9 @@
   <appSettings>
     <!--数据库路径-->
 	  <!--<add key="ConnStr" value="Server=localhost;uid=sa;pwd=xubo123!;database=DBhnyhua;Pooling=true;Connect Timeout=100;Max Pool Size=512;Min Pool Size=0;" />-->
-	 <add key="ConnStr" value="Server=156.247.40.24,11433;uid=sa;pwd=1234qwer.;database=renyi;Pooling=true;Connect Timeout=100;Max Pool Size=512;Min Pool Size=0;"/>
+	 <add key="ConnStr" value="Server=192.168.2.3,1433;uid=sa;pwd=1234qwer.;database=renyi;Pooling=true;Connect Timeout=100;Max Pool Size=512;Min Pool Size=0;"/>
 	  <add key="ConnStr2" value="/App_Data/data.mdb"/>
-    <add key="ServerName" value="156.247.40.24,11433" />
+    <add key="ServerName" value="192.168.2.3,1433" />
     <add key="UserID" value="sa" />
     <add key="UserPwd" value="1234qwer." />
     <add key="DatabaseName" value="renyi" />

Mtxfw.VipSite/left.aspx

@@ -209,7 +209,7 @@
      
 			<% if (IFStores == 1)
        { %>
-           <%if (MemberJS.IndexOf("VIP会员列表") != -1 || MemberJS.IndexOf("提货点列表") != -1 || MemberJS.IndexOf("代理列表") != -1 || MemberJS.IndexOf("爆品专区列表") != -1 || MemberJS.IndexOf("实名认证列表") != -1 || MemberJS.IndexOf("晋级会员查询") != -1 || MemberJS.IndexOf("接点图谱查询") != -1 || MemberJS.IndexOf("推荐图谱查询") != -1 || MemberJS.IndexOf("会员级别升级记录") != -1 || MemberJS.IndexOf("空单变实单记录") != -1)
+           <%if (MemberJS.IndexOf("VIP会员列表") != -1 || MemberJS.IndexOf("提货点列表") != -1 || MemberJS.IndexOf("代理列表") != -1 || MemberJS.IndexOf("爆品专区列表") != -1 || MemberJS.IndexOf("实名认证列表") != -1 || MemberJS.IndexOf("晋级会员查询") != -1 || MemberJS.IndexOf("接点图谱查询") != -1 || MemberJS.IndexOf("推荐图谱查询") != -1 || MemberJS.IndexOf("会员级别升级记录") != -1 || MemberJS.IndexOf("空单变实单记录") != -1 || MemberJS.IndexOf("升级和分配设置") != -1)
              { %>
             <li class="liicon icon_search">
 				<div class="header">
@@ -288,7 +288,10 @@
              { %>
               <li><a target="mainFrame" href="/Admin_Member_update_log.aspx">会员级别升级记录</a></li>
                  <%} %>
-                
+                <%if (MemberJS.IndexOf("升级和分配设置") != -1)
+             { %>
+              <li><a target="mainFrame" href="/Admin_Member_LevelConfig.aspx">升级和分配设置</a></li>
+                 <%} %> 
 					</ul>
 				</span>
 			</li>

Mtxfw.VipSite/pay/hfpay_notify_url_huiyuan.aspx.cs

@@ -890,7 +890,7 @@ namespace Mtxfw.VipSite
                                                                         ///lym修改
                                                                         Mtxfw.Model.P_Guige ggmodel = new DAL.P_Guige().GetModel(Convert.ToInt32(OrderModel.pid));
                                                                         var xfz = ggmodel.G_JG4;
-                                                                        DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
+                                                                        DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, xfz, gtype,  dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
 
                                                                         daoorder.UpdateqyState(0, "1", dt, OrderModel.Id);
                                                                         daoProduct.UpdateJiangLi(OrderModel.pid, 1);

Mtxfw.VipSite/weixin/ex.txt

@@ -1,10 +1,18 @@
-System.InvalidOperationException: ConnectionString 属性尚未初始化。
+System.Data.SqlClient.SqlException (0x80131904): 在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: TCP Provider, error: 0 - 等待的操作过时。) ---> System.ComponentModel.Win32Exception (0x80004005): 等待的操作过时。
-   在 System.Data.SqlClient.SqlConnection.PermissionDemand()
+   在 System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, DbConnectionPool pool, String accessToken, Boolean applyTransientFaultHandling, SqlAuthenticationProviderManager sqlAuthProviderManager)
-   在 System.Data.SqlClient.SqlConnectionFactory.PermissionDemand(DbConnection outerConnection)
+   在 System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
+   在 System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
+   在 System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+   在 System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
+   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
+   在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
+   在 System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
    在 System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
    在 System.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry)
    在 System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
    在 System.Data.SqlClient.SqlConnection.Open()
-   在 Mtxfw.Utility.SqlDbHelper_U.GetDataReader(String sql, SqlParameter[] Params)
+   在 Mtxfw.Utility.SqlDbHelper_U.GetDataReader(String sql, SqlParameter[] Params) 位置 D:\renyi_workspace\RenyiServer\Mtxfw.Utility\SqlDbHelper_U.cs:行号 596
-   在 Mtxfw.DAL.user_info.IsLoginWeb(Int32 gtype, String AdminName, String AdminPwd, String& MemberCard, Int32& MemberId, Int32& ContactID, Int32& IFStores, String& realname, String& realname2, String& phone, String& phone2, String& SFZ, String& BBSConent, String& CompanyCert, String& NCName, String& avatar, String& SJRememberIDS, String& ContactIDS, Int32& IFUpUserName, Int32& IFBecomeBusiness, Int32& uutype, String& MemberJS, Int32& MemberuLevel, Int32& MemberuLevel2, Int32& MemberuLevel3, Int32& MemberuLevel6, Int32& MemberuLevel8, Int32& MemberuLevel14, Int32& MemberuLevel16, Int32& MemberuLevel29, Int32& MemberShippingID, Int32& IFEditBank, Int32& IFPhone, Double& umoney, Double& umoney15, Double& umoney20, Double& umoney22, Double& umoney26, Double& umoney28, Double& umoney29, Double& umoney30, Double& umoney33, Double& umoney39)
+   在 Mtxfw.DAL.user_info.IsLoginWeb(Int32 gtype, String AdminName, String AdminPwd, String& MemberCard, Int32& MemberId, Int32& ContactID, Int32& IFStores, String& realname, String& realname2, String& phone, String& phone2, String& SFZ, String& BBSConent, String& CompanyCert, String& NCName, String& avatar, String& SJRememberIDS, String& ContactIDS, Int32& IFUpUserName, Int32& IFBecomeBusiness, Int32& uutype, String& MemberJS, Int32& MemberuLevel, Int32& MemberuLevel2, Int32& MemberuLevel3, Int32& MemberuLevel6, Int32& MemberuLevel8, Int32& MemberuLevel14, Int32& MemberuLevel16, Int32& MemberuLevel29, Int32& MemberShippingID, Int32& IFEditBank, Int32& IFPhone, Double& umoney, Double& umoney15, Double& umoney20, Double& umoney22, Double& umoney26, Double& umoney28, Double& umoney29, Double& umoney30, Double& umoney33, Double& umoney39) 位置 D:\renyi_workspace\RenyiServer\Mtxfw.DAL\user_info.cs:行号 1902
-   在 Mtxfw.VipSite.ashxAjax.GetLogin2(HttpContext context) 位置 D:\renyi_workspace\RenyiServer\Mtxfw.VipSite\Ajax.ashx.cs:行号 3074
+   在 Mtxfw.VipSite.ashxAjax.GetLogin2(HttpContext context) 位置 D:\renyi_workspace\RenyiServer\Mtxfw.VipSite\Ajax.ashx.cs:行号 3074
+ClientConnectionId:00000000-0000-0000-0000-000000000000
+Error Number:258,State:0,Class:20

Mtxfw.VipSite/xapiajax.ashx.cs

@@ -9617,11 +9617,12 @@ namespace Mtxfw.VipSite
                                 {
                                     P_VIP_P = Convert.ToDouble(adoGuige.G_JG).ToString("f2");
                                     JF = Convert.ToDouble(adoGuige.G_JF).ToString("f2");
-                                    P_Market_P = Convert.ToDouble(adoGuige.G_JG + adoGuige.G_JF).ToString("f2");
+                                    P_Market_P = Convert.ToDouble(adoGuige.G_JG2).ToString("f2");
                                     
                                 }
 
                                 string x = "220x220";
+                                //商城进这里lym
                                 strdata += "{\"_id\":\"" + P_ID + "\",\"name\":\"" + Mtxfw.Utility.Common.ReplaceString(P_NAME) + "\",\"scje\":\"" + P_Market_P + "\",\"jf\":\"" + JF + "\",\"xjje\":\"" + P_M_P + "\",\"hyje\":\"" + P_VIP_P + "\",\"image\":\"" + (P_images.IndexOf("http") != -1 ? P_images + "?imageView2/2/w/220/h/220/q/75" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(P_images, x, "cut")) + "\"},";
                             }
                             if (strdata.Substring(strdata.Length - 1, 1) == ",")
@@ -15339,10 +15340,10 @@ namespace Mtxfw.VipSite
                 if (b)
                 {
 
-                    Mtxfw.Model.user_info umodel = new Mtxfw.DAL.user_info().GetModel(userId);
+                    Mtxfw.Model.user_info umodel = new Mtxfw.DAL.user_info().GetModel(userId);            
                     if (umodel != null)
                     {
-
+           
                         if (umodel.LoginId2 == LoginId)
                         {
 
@@ -15407,6 +15408,13 @@ namespace Mtxfw.VipSite
                                     {
                                         utype = butype;
                                     }
+                                    //非热卖商品，会员小于2不能购买
+                                    if (umodel.uLevel < 2 && utype == 0)
+                                    {
+                                        b = false;
+                                        data = "{\"status\":0,\"msg\":\"会员等级不够！\"}";
+                                    }
+
                                     if (utype == 2)
                                     {
                                         if (P_CATEGORYs.IndexOf(",146,") != -1)
@@ -16444,7 +16452,12 @@ namespace Mtxfw.VipSite
                                                 Double money8 = Convert.ToDouble(OrderModel.Totalprice9.ToString("f2"));//
                                                 if (utype == 0)
                                                 {
-                                                    DAL.MemberStatistics.UpdteYJ(config, umodel, money, money0, money2, money3, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
+                                                    //DAL.MemberStatistics.UpdteYJ(config, umodel, money, money0, money2, money3, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
+                                                    Mtxfw.Model.P_Guige ggmodel = new DAL.P_Guige().GetModel(Convert.ToInt32(OrderModel.pid));
+                                                    var xfz = ggmodel.G_JG4;
+                                                    ///lym修改 这里变成商城余额支付了 
+                                                    //DAL.MemberStatistics.UpdteYJ(config, umodel, money, money0, money2, money3, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
+                                                    DAL.MemberStatistics_huiyuan.UpdteYJ(config, umodel, money, xfz, gtype, dt, OrderModel.ttype, OrderModel.ptype, peitype, OrderModel.orderid, OrderModel.Id, OrderModel.Province, OrderModel.City, OrderModel.County, OrderModel.Tradingarea);
                                                 }                                        
                                                 else if (utype == 2)
                                                 {
@@ -23755,8 +23768,111 @@ namespace Mtxfw.VipSite
                     zhsxf = 0.00;
                 }
                 int wgkcount = 0, ygkcount = umodel.uLevel20, wgkcount0 = 0, ygkcount0 = umodel.uLevel23;
-                
+
-                strdata = "\"userInfo\":{\"id\":\"" + umodel.Id + "\",\"openid\":\"" + umodel.openid + "\",\"yaoqingma\":\"" + Mtxfw.Utility.Security.encrypt(umodel.Id) + "\",\"IFYGM\":" + IFYGM + ",\"IFEditBank\":" + IFEditBank + ",\"IFPhone\":" + (Phone == "" ? 0 : 1) + ",\"yqm\":\"" + yqm + "\",\"uLevel\":\"" + struLevel + "\",\"uLevel0\":\"" + struLevel0 + "\",\"uLevel1\":\"" + struLevel1 + "\",\"uLevel2\":" + umodel.uLevel2 + ",\"sjuLevel\":" + umodel.uLevel16 + ",\"sjuLevel0\":" + umodel.uLevel30 + ",\"sjuLevel1\":" + umodel.uLevel39 + ",\"ifsmrz\":" + umodel.uLevel18 + ",\"dluLevel\":" + umodel.uLevel25 + ",\"tgyuLevel\":" + (umodel.uLevel33 > 1 ? 3 : umodel.uLevel33) + ",\"ifyjhsj\":" + umodel.uLevel34 + ",\"yjhsjnum\":" + umodel.uLevel35 + ",\"Paypush\":\"" + umodel.uLevel36 + "\",\"UserName\":\"" + umodel.UserName + "\",\"NCName\":\"" + NCName + "\",\"RealName\":\"" + umodel.RealName + "\",\"Phone\":\"" + Phone + "\",\"Email\":\"" + umodel.Email + "\",\"UserPic\":\"" + (UserPic != "" ? Mtxfw.Utility.Common.cminimage(UserPic) : "") + "\",\"Province\":\"" + umodel.Province + "\",\"City\":\"" + umodel.City + "\",\"County\":\"" + umodel.County + "\",\"ifywc\":" + umodel.uLevel19 + ",\"wgkcount\":" + wgkcount + ",\"ygkcount\":" + ygkcount + ",\"wgkcount0\":" + wgkcount0 + ",\"ygkcount0\":" + ygkcount0 + ",\"zsymoney\":\"" + zsymoney + "\",\"jrsymoney\":\"" + jrsymoney + "\",\"zrsymoney\":\"" + zrsymoney + "\",\"xjye\":\"" + xjye + "\",\"xjjye\":\"" + xjjye + "\",\"jhmye\":\"" + jhmye + "\",\"tgmeye\":\"" + tgmeye + "\",\"mfye\":\"" + mfye + "\",\"ggjfye\":\"" + ggjfye + "\",\"gxzye\":\"" + gxzye + "\",\"hyzye\":\"" + hyzye + "\",\"ksdye\":\"" + ksdye + "\",\"lljye\":\"" + lljye + "\",\"ggzye\":\"" + ggzye + "\",\"zzedze\":\"" + zzedze + "\",\"zzedye\":\"" + zzedye + "\",\"zzjfye\":\"" + zzjfye + "\",\"hkksye\":\"" + hkksye + "\",\"hkdjye\":\"" + hkdjye + "\",\"hkjdye\":\"" + hkjdye + "\",\"btjye\":\"" + btjye + "\",\"btzye\":\"" + btzye + "\",\"GGEnable\":\"" + config.FHEnable1 + "\",\"TXEnable\":\"" + TXEnable + "\",\"ZZEnable\":\"" + ZZEnable + "\",\"ZZEnable0\":\"" + ZZEnable0 + "\",\"ZZEnable1\":\"" + ZZEnable1 + "\",\"ZCEnable\":\"" + ZCEnable + "\",\"ZHEnable\":\"" + ZHEnable + "\",\"ZHEnable0\":\"" + ZHEnable0 + "\",\"ZHEnable1\":\"" + ZHEnable1 + "\",\"FHEnable\":\"" + config.FHEnable + "\",\"bdshEnable\":\"" + bdshEnable + "\",\"zhsxf\":\"" + zhsxf.ToString() + "\",\"ksdjg\":\"" + config.webMoney79 + "\",\"KHName\":\"" + umodel.ProductName + "\",\"BankName\":\"" + umodel.RealName2 + "\",\"BankCard\":\"" + umodel.Phone2 + "\",\"BankKHH\":\"" + umodel.PostalCode + "\",\"AliAccount\":\"" + umodel.AliAccount + "\",\"AliName\":\"" + umodel.AliName + "\",\"aliimage\":\"" + (umodel.aliimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(umodel.aliimage)) + "\",\"weixinimage\":\"" + (umodel.weixinimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(umodel.weixinimage)) + "\",\"qbaddress\":\"" + umodel.qbaddress + "\",\"ifshowzzjf\":\"1\",\"txtype\":\"" + config.HFHEnable + "\",\"txsxf\":\"" + config.webMoney50 + "\",\"txsxf0\":\"" + config.webMoney51 + "\",\"iftx\":\"" + iftx + "\",\"txtype\":\"" + config.CQEnable + "\",\"txmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney64)) + "\",\"txmsg0\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney93)) + "\",\"zzmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney94)) + "\",\"zzmsg0\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney95)) + "\",\"zzmsg1\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney96)) + "\",\"zzmsg2\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney97)) + "\",\"czmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney152)) + "\",\"upmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney102)) + "\",\"tpaddress\":\"" + config.webMoney47 + "\",\"aliimage0\":\"" + (config.webMoney55 == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney55, "1000x1000", config.webImgMode)) + "\",\"weixinimage0\":\"" + (config.webMoney56 == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney56, "1000x1000", config.webImgMode)) + "\"}";
+                // strdata = "\"userInfo\":{\"id\":\"" + umodel.Id + "\",\"openid\":\"" + umodel.openid + "\",\"yaoqingma\":\"" + Mtxfw.Utility.Security.encrypt(umodel.Id) + "\",\"IFYGM\":" + IFYGM + ",\"IFEditBank\":" + IFEditBank + ",\"IFPhone\":" + (Phone == "" ? 0 : 1) + ",\"yqm\":\"" + yqm + "\",\"uLevel\":\"" + struLevel + "\",\"uLevel0\":\"" + struLevel0 + "\",\"uLevel1\":\"" + struLevel1 + "\",\"uLevel2\":" + umodel.uLevel2 + ",\"sjuLevel\":" + umodel.uLevel16 + ",\"sjuLevel0\":" + umodel.uLevel30 + ",\"sjuLevel1\":" + umodel.uLevel39 + ",\"ifsmrz\":" + umodel.uLevel18 + ",\"dluLevel\":" + umodel.uLevel25 + ",\"tgyuLevel\":" + (umodel.uLevel33 > 1 ? 3 : umodel.uLevel33) + ",\"ifyjhsj\":" + umodel.uLevel34 + ",\"yjhsjnum\":" + umodel.uLevel35 + ",\"Paypush\":\"" + umodel.uLevel36 + "\",\"UserName\":\"" + umodel.UserName + "\",\"NCName\":\"" + NCName + "\",\"RealName\":\"" + umodel.RealName + "\",\"Phone\":\"" + Phone + "\",\"Email\":\"" + umodel.Email + "\",\"UserPic\":\"" + (UserPic != "" ? Mtxfw.Utility.Common.cminimage(UserPic) : "") + "\",\"Province\":\"" + umodel.Province + "\",\"City\":\"" + umodel.City + "\",\"County\":\"" + umodel.County + "\",\"ifywc\":" + umodel.uLevel19 + ",\"wgkcount\":" + wgkcount + ",\"ygkcount\":" + ygkcount + ",\"wgkcount0\":" + wgkcount0 + ",\"ygkcount0\":" + ygkcount0 + ",\"zsymoney\":\"" + zsymoney + "\",\"jrsymoney\":\"" + jrsymoney + "\",\"zrsymoney\":\"" + zrsymoney + "\",\"xjye\":\"" + xjye + "\",\"xjjye\":\"" + xjjye + "\",\"jhmye\":\"" + jhmye + "\",\"tgmeye\":\"" + tgmeye + "\",\"mfye\":\"" + mfye + "\",\"ggjfye\":\"" + ggjfye + "\",\"gxzye\":\"" + gxzye + "\",\"hyzye\":\"" + hyzye + "\",\"ksdye\":\"" + ksdye + "\",\"lljye\":\"" + lljye + "\",\"ggzye\":\"" + ggzye + "\",\"zzedze\":\"" + zzedze + "\",\"zzedye\":\"" + zzedye + "\",\"zzjfye\":\"" + zzjfye + "\",\"hkksye\":\"" + hkksye + "\",\"hkdjye\":\"" + hkdjye + "\",\"hkjdye\":\"" + hkjdye + "\",\"btjye\":\"" + btjye + "\",\"btzye\":\"" + btzye + "\",\"GGEnable\":\"" + config.FHEnable1 + "\",\"TXEnable\":\"" + TXEnable + "\",\"ZZEnable\":\"" + ZZEnable + "\",\"ZZEnable0\":\"" + ZZEnable0 + "\",\"ZZEnable1\":\"" + ZZEnable1 + "\",\"ZCEnable\":\"" + ZCEnable + "\",\"ZHEnable\":\"" + ZHEnable + "\",\"ZHEnable0\":\"" + ZHEnable0 + "\",\"ZHEnable1\":\"" + ZHEnable1 + "\",\"FHEnable\":\"" + config.FHEnable + "\",\"bdshEnable\":\"" + bdshEnable + "\",\"zhsxf\":\"" + zhsxf.ToString() + "\",\"ksdjg\":\"" + config.webMoney79 + "\",\"KHName\":\"" + umodel.ProductName + "\",\"BankName\":\"" + umodel.RealName2 + "\",\"BankCard\":\"" + umodel.Phone2 + "\",\"BankKHH\":\"" + umodel.PostalCode + "\",\"AliAccount\":\"" + umodel.AliAccount + "\",\"AliName\":\"" + umodel.AliName + "\",\"aliimage\":\"" + (umodel.aliimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(umodel.aliimage)) + "\",\"weixinimage\":\"" + (umodel.weixinimage == "" ? "" : Mtxfw.Utility.Common.cmaximage(umodel.weixinimage)) + "\",\"qbaddress\":\"" + umodel.qbaddress + "\",\"ifshowzzjf\":\"1\",\"txtype\":\"" + config.HFHEnable + "\",\"txsxf\":\"" + config.webMoney50 + "\",\"txsxf0\":\"" + config.webMoney51 + "\",\"iftx\":\"" + iftx + "\",\"txtype\":\"" + config.CQEnable + "\",\"txmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney64)) + "\",\"txmsg0\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney93)) + "\",\"zzmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney94)) + "\",\"zzmsg0\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney95)) + "\",\"zzmsg1\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney96)) + "\",\"zzmsg2\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney97)) + "\",\"czmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney152)) + "\",\"upmsg\":\"" + Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney102)) + "\",\"tpaddress\":\"" + config.webMoney47 + "\",\"aliimage0\":\"" + (config.webMoney55 == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney55, "1000x1000", config.webImgMode)) + "\",\"weixinimage0\":\"" + (config.webMoney56 == "" ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney56, "1000x1000", config.webImgMode)) + "\"}";
+                // 使用 Dictionary + JsonSerializer 方式构建 JSON，更易维护
+                var userInfo = new Dictionary<string, object>
+                {
+                    ["id"] = umodel.Id,
+                    ["openid"] = umodel.openid,
+                    ["yaoqingma"] = Mtxfw.Utility.Security.encrypt(umodel.Id),
+                    ["IFYGM"] = IFYGM,
+                    ["IFEditBank"] = IFEditBank,
+                    ["IFPhone"] = string.IsNullOrEmpty(Phone) ? 0 : 1,
+                    ["yqm"] = yqm,
+                    ["uLevel"] = struLevel,
+                    ["iLevel"] = uLevel,
+                    ["uLevel0"] = struLevel0,
+                    ["uLevel1"] = struLevel1,
+                    ["uLevel2"] = umodel.uLevel2,
+                    ["sjuLevel"] = umodel.uLevel16,
+                    ["sjuLevel0"] = umodel.uLevel30,
+                    ["sjuLevel1"] = umodel.uLevel39,
+                    ["ifsmrz"] = umodel.uLevel18,
+                    ["dluLevel"] = umodel.uLevel25,
+                    ["tgyuLevel"] = umodel.uLevel33 > 1 ? 3 : umodel.uLevel33,
+                    ["ifyjhsj"] = umodel.uLevel34,
+                    ["yjhsjnum"] = umodel.uLevel35,
+                    ["Paypush"] = umodel.uLevel36,
+                    ["UserName"] = umodel.UserName,
+                    ["NCName"] = NCName,
+                    ["RealName"] = umodel.RealName,
+                    ["Phone"] = Phone,
+                    ["Email"] = umodel.Email,
+                    ["UserPic"] = string.IsNullOrEmpty(UserPic) ? "" : Mtxfw.Utility.Common.cminimage(UserPic),
+                    ["Province"] = umodel.Province,
+                    ["City"] = umodel.City,
+                    ["County"] = umodel.County,
+                    ["ifywc"] = umodel.uLevel19,
+                    ["wgkcount"] = wgkcount,
+                    ["ygkcount"] = ygkcount,
+                    ["wgkcount0"] = wgkcount0,
+                    ["ygkcount0"] = ygkcount0,
+                    ["zsymoney"] = zsymoney,
+                    ["jrsymoney"] = jrsymoney,
+                    ["zrsymoney"] = zrsymoney,
+                    ["xjye"] = xjye,
+                    ["xjjye"] = xjjye,
+                    ["jhmye"] = jhmye,
+                    ["tgmeye"] = tgmeye,
+                    ["mfye"] = mfye,
+                    ["ggjfye"] = ggjfye,
+                    ["gxzye"] = gxzye,
+                    ["hyzye"] = hyzye,
+                    ["ksdye"] = ksdye,
+                    ["lljye"] = lljye,
+                    ["ggzye"] = ggzye,
+                    ["zzedze"] = zzedze,
+                    ["zzedye"] = zzedye,
+                    ["zzjfye"] = zzjfye,
+                    ["hkksye"] = hkksye,
+                    ["hkdjye"] = hkdjye,
+                    ["hkjdye"] = hkjdye,
+                    ["btjye"] = btjye,
+                    ["btzye"] = btzye,
+                    ["GGEnable"] = config.FHEnable1,
+                    ["TXEnable"] = TXEnable,
+                    ["ZZEnable"] = ZZEnable,
+                    ["ZZEnable0"] = ZZEnable0,
+                    ["ZZEnable1"] = ZZEnable1,
+                    ["ZCEnable"] = ZCEnable,
+                    ["ZHEnable"] = ZHEnable,
+                    ["ZHEnable0"] = ZHEnable0,
+                    ["ZHEnable1"] = ZHEnable1,
+                    ["FHEnable"] = config.FHEnable,
+                    ["bdshEnable"] = bdshEnable,
+                    ["zhsxf"] = zhsxf.ToString(),
+                    ["ksdjg"] = config.webMoney79,
+                    ["KHName"] = umodel.ProductName,
+                    ["BankName"] = umodel.RealName2,
+                    ["BankCard"] = umodel.Phone2,
+                    ["BankKHH"] = umodel.PostalCode,
+                    ["AliAccount"] = umodel.AliAccount,
+                    ["AliName"] = umodel.AliName,
+                    ["aliimage"] = string.IsNullOrEmpty(umodel.aliimage) ? "" : Mtxfw.Utility.Common.cmaximage(umodel.aliimage),
+                    ["weixinimage"] = string.IsNullOrEmpty(umodel.weixinimage) ? "" : Mtxfw.Utility.Common.cmaximage(umodel.weixinimage),
+                    ["qbaddress"] = umodel.qbaddress,
+                    ["ifshowzzjf"] = 1,
+                    ["txtype"] = config.HFHEnable,
+                    ["txsxf"] = config.webMoney50,
+                    ["txsxf0"] = config.webMoney51,
+                    ["iftx"] = iftx,
+                    ["txmsg"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney64)),
+                    ["txmsg0"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney93)),
+                    ["zzmsg"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney94)),
+                    ["zzmsg0"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney95)),
+                    ["zzmsg1"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney96)),
+                    ["zzmsg2"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney97)),
+                    ["czmsg"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney152)),
+                    ["upmsg"] = Mtxfw.Utility.Common.ReplaceString(Mtxfw.Utility.Common.InputText(config.webMoney102)),
+                    ["tpaddress"] = config.webMoney47,
+                    ["aliimage0"] = string.IsNullOrEmpty(config.webMoney55) ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney55, "1000x1000", config.webImgMode),
+                    ["weixinimage0"] = string.IsNullOrEmpty(config.webMoney56) ? "" : config.webUrl + Mtxfw.Utility.Common.GetCoverPic(config.webMoney56, "1000x1000", config.webImgMode)
+                };
+                strdata = "\"userInfo\":" + JsonConvert.SerializeObject(userInfo);
+                //将上一行字符串的拼接方法用更先进的写法重写
+                   
+                 
             }
             return strdata;
         }

修改说明.txt

@@ -20,7 +20,7 @@ log4net:  log4net 是 Apache 软件基金会旗下著名组件 log4j 的 .NET
 4. 管理员菜单权限更新脚本：
 
 update Adminjs set 
-js='VIP会员列表 | 提货点列表 | 实名认证列表 | 推荐图谱查询 | 修改推荐人 | 删除会员 | 注册新会员 | 修改余额 | 修改会员资料 | 会员级别升级记录 | 高级管理功能 | 资讯管理 | 企业介绍 | 发图素材 | 健康知识 | 修改隐私政策 | 修改用户服务协议 | 客服信息管理 | 滚动图片管理 | 微信菜单管理 | 操作教程 | 视频管理 | 奖金详情 | 删除奖金明细 | 充值管理 | 提现管理 | 导出数据 | 盛世丰花优选商品列表 | 热卖推荐商品列表 | 订单列表 | 商品分类管理 | 运费设置 | 管理员列表 | 角色管理 | 系统设置 | 数据管理 | 登录日志 | 操作日志 | 修改兑换券 | 兑换商城商品列表 | 健康译站管理 |'
+js='VIP会员列表 | 提货点列表 | 实名认证列表 | 推荐图谱查询 | 修改推荐人 | 删除会员 | 注册新会员 | 修改余额 | 修改会员资料 | 会员级别升级记录 | 高级管理功能 | 资讯管理 | 企业介绍 | 发图素材 | 健康知识 | 修改隐私政策 | 修改用户服务协议 | 客服信息管理 | 滚动图片管理 | 微信菜单管理 | 操作教程 | 视频管理 | 奖金详情 | 删除奖金明细 | 充值管理 | 提现管理 | 导出数据 | 盛世丰花优选商品列表 | 热卖推荐商品列表 | 订单列表 | 商品分类管理 | 运费设置 | 管理员列表 | 角色管理 | 系统设置 | 数据管理 | 登录日志 | 操作日志 | 修改兑换券 | 兑换商城商品列表 | 健康译站管理 | 升级和分配设置 |'
 where id=1