edit

SiteCore/Handler/sync.order.cs

@@ -113,7 +113,9 @@ namespace SiteCore.Handler
                 if (tid.Length > 0)
                 {
 
-                    lw.Add(string.Format("(ctid='{0}' or tid='{0}' or OrderSn='{0}')", tid));
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
                 }
                 if (buyernick.Length > 0)
                 {
@@ -259,9 +261,9 @@ namespace SiteCore.Handler
                 tablename = "view_orderlist_end";
             }
             dt = WebCache.GetData(tablename, dStruct);
-            dt.Columns.Add(new DataColumn("gongchuang", typeof(string)));
             if (dt != null && dt.Rows.Count > 0)
             {
+                dt.Columns.Add(new DataColumn("gongchuang", typeof(string)));
                 foreach (DataRow dr in dt.Rows)
                 {
 
@@ -1785,11 +1787,11 @@ namespace SiteCore.Handler
                 entitycell.ctid = entity.tid;
                 //唯一标识
                 entitycell.OrderSn = entity.tid;
-                //string orderSn = dataHelper.getSaleOrderSn();
-                //if (orderSn != "")
-                // {
-                //    entitycell.OrderSn = orderSn;
-                // }
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entitycell.OrderSn = orderSn;
+                }
                 entitycell.tid = entity.tid;
                 //if (preStr == "X_")
                 //{
@@ -2410,6 +2412,17 @@ namespace SiteCore.Handler
             }
         }
 
+        public string getTidByCtid(string ctid)
+        {
+            string tid = "";
+            string sql = string.Format("select tid from CE_ErpTradeCell where (ctid='{0}' or tid='{0}' or orderSn='{0}')", ctid);
+            DataTable dataTable = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            if (dataTable != null && dataTable.Rows.Count > 0)
+            {
+                tid = dataTable.Rows[0]["tid"].ToString();
+            }
+            return tid;
+        }
 
         public void get_erp_myorderlist()
         {
@@ -2418,7 +2431,9 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             if (tid.Length > 0)
             {
-                lw.Add(string.Format("(ctid='{0}' or tid='{0}' or orderSn='{0}')", tid));
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
             }
             else
             {
@@ -2523,7 +2538,9 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             if (tid.Length > 0)
             {
-                lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
             }
             else
             {
@@ -2768,7 +2785,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid ='{0}' or orderSn ='{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -2876,7 +2898,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid='{0}' or tid='{0}' or orderSn='{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -3479,7 +3506,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid='{0}' or tid='{0}' or orderSn='{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -3543,7 +3575,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid='{0}' or tid='{0}' or orderSn='{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
 
@@ -4147,7 +4184,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4223,7 +4265,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4299,7 +4346,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%') ", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4430,7 +4482,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid='{0}' or tid='{0}' or orderSn='{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4506,7 +4563,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4599,7 +4661,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4651,7 +4718,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4701,7 +4773,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -4974,7 +5051,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
 
@@ -5063,7 +5145,11 @@ namespace SiteCore.Handler
             if (tid.Length > 0 || date1.Length > 0 || buyernick.Length > 0)
             {
                 if (tid.Length > 0)
-                    lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+                }
                 if (buyernick.Length > 0)
                     lw.Add(string.Format("buyer_nick='{0}'", buyernick));
                 string dw = GetDateMinuteWhere("pay_time", date1, date2);
@@ -5157,7 +5243,12 @@ namespace SiteCore.Handler
             if (tid.Length > 0 || date1.Length > 0 || buyernick.Length > 0)
             {
                 if (tid.Length > 0)
-                    lw.Add(string.Format("(ctid like '%{0}%' or OrderSn like '%{0}%')", tid));
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+
+                }
                 if (buyernick.Length > 0)
                     lw.Add(string.Format("buyer_nick='{0}'", buyernick));
                 string dw = GetDateMinuteWhere("pay_time", date1, date2);
@@ -5313,7 +5404,11 @@ namespace SiteCore.Handler
             if (tid.Length > 0 || date1.Length > 0 || buyernick.Length > 0 || pldate1.Length > 0)
             {
                 if (tid.Length > 0)
-                    lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+                }
                 if (buyernick.Length > 0)
                     lw.Add(string.Format("buyer_nick='{0}'", buyernick));
                 string dw = GetDateMinuteWhere("pay_time", date1, date2);
@@ -5363,7 +5458,7 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid ='{0}' or orderSn ='{0}')", tid));
+
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick='{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -5379,13 +5474,33 @@ namespace SiteCore.Handler
 
             string date1 = GetPostString("date1");
             string date2 = GetPostString("date2");
-            string dw = GetDateMinuteWhere("pay_time", date1, date2);
-            if (dw.Length > 0) lw.Add(dw);
             string pldate1 = GetPostString("placedate1");
             string pldate2 = GetPostString("placedate2");
-            string dw_place = GetDateMinuteWhere("FinishPlaceTime", pldate1, pldate2);
-            if (dw_place.Length > 0) lw.Add(dw_place);
+            if (tid.Length > 0 || date1.Length > 0 || buyernick.Length > 0 || pldate1.Length > 0)
+            {
+                if (tid.Length > 0)
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+                }
+                if (buyernick.Length > 0)
+                    lw.Add(string.Format("buyer_nick='{0}'", buyernick));
+                string dw = GetDateMinuteWhere("pay_time", date1, date2);
+                if (dw.Length > 0) lw.Add(dw);
 
+                string dw_place = GetDateMinuteWhere("FinishPlaceTime", pldate1, pldate2);
+                if (dw_place.Length > 0) lw.Add(dw_place);
+            }
+            else
+            {
+                if (ex_psize <= 0) //非导出的时候 显示3个月数据
+                {
+                    lw.Add(string.Format("datediff(d,pay_time,getdate())<=92 "));
+
+                }
+
+            }
             string price1 = GetPostString("price1");
             if (price1.Length > 0) lw.Add(string.Format("payment >= '{0}'", price1));
             string price2 = GetPostString("price2");
@@ -5978,11 +6093,21 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             if (st == 3)
             {
-                if (tid.Length > 0) lw.Add(string.Format("tid = '{0}'", tid));
+                if (tid.Length > 0)
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+                }
             }
             else
             {
-                if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or tid = '{0}' or orderSn = '{0}')", tid));
+                if (tid.Length > 0)
+                {
+                    string select_tid = getTidByCtid(tid);
+
+                    lw.Add(string.Format("tid='{0}'", select_tid));
+                }
             }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -6197,7 +6322,12 @@ namespace SiteCore.Handler
             int st = 2;
             string tid = GetPostString("ctid");
 
-            if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or tid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -6317,7 +6447,12 @@ namespace SiteCore.Handler
             int st = 2;
             string tid = GetPostString("ctid");
 
-            if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or tid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -6498,7 +6633,12 @@ namespace SiteCore.Handler
             List<string> lw = new List<string>();
 
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(tid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -6637,7 +6777,12 @@ namespace SiteCore.Handler
             int st = 4;
             string tid = GetPostString("ctid");
 
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
 
@@ -6756,11 +6901,11 @@ namespace SiteCore.Handler
                         }
                         //唯一标识
                         newentity.OrderSn = newentity.ctid;
-                        /* string orderSn = dataHelper.getSaleOrderSn();
-                         if (orderSn != "")
-                         {
-                             newentity.OrderSn = orderSn;
-                         }*/
+                        string orderSn = dataHelper.getSaleOrderSn();
+                        if (orderSn != "")
+                        {
+                            newentity.OrderSn = orderSn;
+                        }
                         newentity.AfterSaleState = 0;
                         newentity.AfterSaleMethod = afterMethod;
                         if (!ishav)
@@ -7275,7 +7420,12 @@ namespace SiteCore.Handler
             List<string> lw = new List<string>();
             int st = GetInt("st");
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(tid = '{0}' or ctid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -9845,7 +9995,12 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid like '%{0}%' or orderSn like '%{0}%')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
             string buyernick = GetPostString("buyer_nick");
@@ -12380,7 +12535,12 @@ namespace SiteCore.Handler
             int st = 2;
             string tid = GetPostString("ctid");
 
-            if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or tid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -12489,7 +12649,12 @@ namespace SiteCore.Handler
             int st = 2;
             string tid = GetPostString("ctid");
 
-            if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or tid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0)
+            {
+                string select_tid = getTidByCtid(tid);
+
+                lw.Add(string.Format("tid='{0}'", select_tid));
+            }
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));

SiteCore/taobao/tmcHelper.cs

@@ -390,7 +390,7 @@ namespace SiteCore
 
         static List<string> postcodes = new List<string>()
         {
-           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo"
+           "yujia","taolai","zhufan","dingyi","lingtao","yangguangmao","xinkeli","yuejia","maiyu","xiyinshuo","hanghe","midier"
         };
 
         public static void Api_TmcTradeMsg(string res)
@@ -852,11 +852,11 @@ namespace SiteCore
                     //唯一标识
 
                     entity.OrderSn = tObj.refOid;
-                    /*string orderSn = dataHelper.getSaleOrderSn();
+                    string orderSn = dataHelper.getSaleOrderSn();
                     if (orderSn != "")
                     {
                         entity.OrderSn = orderSn;
-                    }*/
+                    }
                     entity.tid = tObj.refOid;
                     entity.seller_memo = "";
                     entity.payment = Convert.ToDouble(tObj.payment);
@@ -1428,11 +1428,11 @@ namespace SiteCore
                     entity.ctid = tid;
                     //唯一标识
                     entity.OrderSn = tid;
-                    /*string orderSn = dataHelper.getSaleOrderSn();
+                    string orderSn = dataHelper.getSaleOrderSn();
                     if (orderSn != "")
                     {
                         entity.OrderSn = orderSn;
-                    }*/
+                    }
                     entity.tid = tid;
                     ishaveBu = false;
                 }
@@ -1537,11 +1537,11 @@ namespace SiteCore
                     entity.ctid = tid;
                     //唯一标识
                     entity.OrderSn = tid;
-                    /* string orderSn = dataHelper.getSaleOrderSn();
-                     if (orderSn != "")
-                     {
-                         entity.OrderSn = orderSn;
-                     }*/
+                    string orderSn = dataHelper.getSaleOrderSn();
+                    if (orderSn != "")
+                    {
+                        entity.OrderSn = orderSn;
+                    }
                     entity.tid = tid;
                     entity.seller_memo = smemo;
                     entity.payment = Convert.ToDouble(father.payment);
@@ -1819,11 +1819,11 @@ namespace SiteCore
             entity.ctid = ctid;
             //唯一标识
             entity.OrderSn = ctid;
-            /*string orderSn = dataHelper.getSaleOrderSn();
+            string orderSn = dataHelper.getSaleOrderSn();
             if (orderSn != "")
             {
                 entity.OrderSn = orderSn;
-            }*/
+            }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             if (entity.ShopId == 0)
@@ -2230,11 +2230,11 @@ namespace SiteCore
             entity.ctid = ctid;
             //唯一标识
             entity.OrderSn = ctid;
-            /*string orderSn = dataHelper.getSaleOrderSn();
+            string orderSn = dataHelper.getSaleOrderSn();
             if (orderSn != "")
             {
                 entity.OrderSn = orderSn;
-            }*/
+            }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             if (entity.ShopId == 0)
@@ -2433,11 +2433,11 @@ namespace SiteCore
             entity.ctid = ctid;
             //唯一标识
             entity.OrderSn = ctid;
-            /*string orderSn = dataHelper.getSaleOrderSn();
+            string orderSn = dataHelper.getSaleOrderSn();
             if (orderSn != "")
             {
                 entity.OrderSn = orderSn;
-            }*/
+            }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             string[] acclist = itemMemo.Split('-');
@@ -2603,11 +2603,11 @@ namespace SiteCore
             entity.ctid = ctid;
             //唯一标识
             entity.OrderSn = ctid;
-            /* string orderSn = dataHelper.getSaleOrderSn();
-             if (orderSn != "")
-             {
-                 entity.OrderSn = orderSn;
-             }*/
+            string orderSn = dataHelper.getSaleOrderSn();
+            if (orderSn != "")
+            {
+                entity.OrderSn = orderSn;
+            }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             string[] acclist = memo_index1.Split('-');
@@ -2958,11 +2958,11 @@ namespace SiteCore
             entity.ctid = ctid;
             //唯一标识
             entity.OrderSn = ctid;
-            /* string orderSn = dataHelper.getSaleOrderSn();
-             if (orderSn != "")
-             {
-                 entity.OrderSn = orderSn;
-             }*/
+            string orderSn = dataHelper.getSaleOrderSn();
+            if (orderSn != "")
+            {
+                entity.OrderSn = orderSn;
+            }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             string[] acclist = itemMemo.Split('-');