修改售后统计

SiteCore/Handler/sync.getbase.cs

@@ -73,7 +73,7 @@ namespace SiteCore.Handler
             StringBuilder sqlbd = new StringBuilder();
             if (cusCode == "CustomerService" || cusCode == "Director" || cusCode == "CustomerMaster")
             {
-                if ((cusCode == "Director" && CurrentUser.UserPost.OrgID == 31) || CurrentUser.UserPost.OrgID == 98)
+                if ((cusCode == "Director" && CurrentUser.UserPost.OrgID == 31) || CurrentUser.UserPost.OrgID == 98 || CurrentUser.UserPost.OrgID == 138)
                 {
                     sqlbd.AppendFormat("select id, (name+'_'+");
                     sqlbd.AppendFormat("(select convert(varchar,count(ctid)) from view_erptradecell where designuserid=view_ErpUser.id and orderstate=4)");
@@ -122,7 +122,7 @@ namespace SiteCore.Handler
                 sqlbd.AppendFormat(") as bname,pemShop from view_ErpUser");
                 sqlbd.AppendFormat(" where (PostCode like '%Designer%' or PostCode like '%Place%'or PostCode like '%Director%' or ID={1} or PostCode='SysAdmin' or PostCode='Summarize' or PostCode='CustomerMr')  and charindex((select ','+convert(varchar(10),ID)+',' from CE_ErpShop where ShopName='{0}'),','+pemShop+',')>0 and isOpen=1", penShopName, CurrentUser.UserID);
             }
-            if (cusCode != "SysAdmin" && cusCode != "Summarize" && CurrentUser.UserID != 73)
+            if (cusCode != "SysAdmin" && cusCode != "Summarize" && CurrentUser.UserID != 73 && CurrentUser.UserID != 4516)
             {
                 sqlbd.AppendFormat(" and ID <> 3542");
             }

SiteCore/Handler/sync.order.cs

@@ -65,13 +65,11 @@ namespace SiteCore.Handler
             string poscode = CurrentUser.UserPost.Post.Code;
 
             DataStruct dStruct = GetPostStruct();
-            //string a = SecurityHelper.DecryptSymmetric("BnK3+504SQ8=");
-            //apiHelper.Api_SyncOrderByTime("598825");
+            //string a = SecurityHelper.DecryptSymmetric("kncY+n90QZs=");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
-            //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
             //apiHelper.API_LogisticsOnlineSend("2460807662231834875", "yujia", "YTO-GDCYT", "YT7524607355919");
             //banniuApiHelper.sendLogisticsInfo(null);
-            //commonHelper.setOrderDummyDelivery("4055992920657411904");
+            //commonHelper.autoDistributeToSupplier(CeErpTradeCell.GetByCode("260112211259328680"));
             //commonHelper.checkOrderListDesignInfo("1111122222333338841");
             //CeErpTradeCell entity = CeErpTradeCell.GetByCtid("2811249339088067154");
             //int sid = commonHelper.autoDistributeToSupplier(entity);

SiteCore/Handler/sync.orderReport.cs

@@ -2402,9 +2402,10 @@ namespace SiteCore.Handler
             dr_he[7] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
+                string name = row["Name"].ToString();
                 string afterSaleResponsible = row["AfterSaleResponsible"].ToString();
                 if (string.IsNullOrEmpty(afterSaleResponsible)) { continue; }
-                if (afterSaleResponsible.Contains("设计师"))
+                if (afterSaleResponsible.Contains("设计师:" + name))
                 {
                     DataRow dr = dt.NewRow();
                     dr[0] = row["OrgName"];
@@ -2499,9 +2500,10 @@ namespace SiteCore.Handler
             dr_he[7] = 0;
             foreach (DataRow row in dtafter.Rows)
             {
+                string name = row["Name"].ToString();
                 string afterSaleResponsible = row["AfterSaleResponsible"].ToString();
                 if (string.IsNullOrEmpty(afterSaleResponsible)) { continue; }
-                if (afterSaleResponsible.Contains("客服"))
+                if (afterSaleResponsible.Contains("客服:" + name))
                 {
                     DataRow dr = dt.NewRow();
                     dr[0] = row["OrgName"];

SiteCore/taobao/commonHelper.cs

@@ -2912,6 +2912,10 @@ namespace SiteCore
 
         public static CeErpTradeCellExtend sendSpuData(CeErpTradeCell ceErpTradeCell, CeErpTradeCellExtend ceErpTradeCellExtend)
         {
+            if (ceErpTradeCellExtend == null)
+            {
+                return null;
+            }
             string result = designHelper.API_CheckOrderTo(ceErpTradeCellExtend.ctid, ceErpTradeCellExtend.spu_id, ceErpTradeCell.ShopId);
             ceErpTradeCellExtend.ToType = result;
             int dispatchSort = 0;

SiteCore/taobao/tmcHelper.cs

@@ -731,7 +731,7 @@ namespace SiteCore
                     {
                         order.spu_id = item.refSpuId;
                     }
-                    List<string> standards_list = new List<string>() { "现货", "封酒贴", "兔团团", "帆布", "手拉旗", "kt", "条幅", "臂贴" };
+                    List<string> standards_list = new List<string>() { "现货", "封酒贴", "兔团团", "帆布", "手拉旗", "kt", "条幅", "臂贴","挂画" };
                     bool isInList = false;
                     foreach (string text in standards_list)
                     {