推购新增搜索条件

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)
                     {
@@ -914,7 +914,7 @@ namespace SiteCore
                         else if (xianhuoMemo.IndexOf("臂贴") != -1)
                         {
                             entity.OrderState = 2;
-                            entity.ProductId = 327;
+                            entity.ProductId = 2690;
                             entity.IsXianHuo = 0;
                             xianhuoMemo = xianhuoMemo.Replace("现货", "");
                             xianhuoMemo = xianhuoMemo.Replace(" ", "");
@@ -3408,11 +3408,11 @@ namespace SiteCore
             CeErpSukuraData.createInfo(entity.ctid, 1);
             LogHelper.addLog(entity.ctid, entity.CustomerUserId, "普通推送生成：" + entity.seller_memo, entity.OrderState);
         }
-        public static List<int> shop_list = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 18, 24, 28, 31, 32, 56, 61, 126, 128 };
+        public static List<int> shop_list = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 18, 24, 26, 28, 31, 32, 45, 56, 61, 126, 128 };
         public static void dealOldCustomerEntityTag(ref CeErpTradeCell entity, CeErpTrade father)
         {
             //UV跟指定店铺
-            int[] shopList = { 49, 67, 26, 45, 13, 68, 20, 17, 52, 21, 66, 63, 64 };
+            int[] shopList = { 49, 67, 13, 68, 20, 17, 52, 21, 66, 63, 64 };
 
             if ((entity.ProductId == 43 && !shop_list.Contains(entity.ShopId)) || shopList.Contains(entity.ShopId))
             {

Web/EFinance/StayGoods.aspx.cs

@@ -19,7 +19,7 @@ public partial class EFinance_StayGoods : BasePage
         //_selfCheckPermission = true;
         _keyFilterVisible = false;
         _addVisible = false;
-        _filterItem = "order,shop,wang,returnvstate,returntime,cus,finish_time,persuadetype,customer_org";
+        _filterItem = "order,shop,wang,returnvstate,returntime,cus,finish_time,persuadetype,customer_org,designer_org";
         _filterDateBtn = false;
     }
 

Web/EFinance/js/StayGoods.js

@@ -157,7 +157,7 @@ function searchFn() {
     //console.log("565656565", data);
     grid.load({
         tid: s.tid, shopname: s.shop, wangwang: s.ww, customer: s.customer, finishdate1: s.finishdate1, finishdate2: s.finishdate2,
-        returndate1: s.returndate1, returndate2: s.returndate2, returnvstate: s.returnvstate, persuadetype: s.persuadetype, customerOrg: s.customerorg
+        returndate1: s.returndate1, returndate2: s.returndate2, returnvstate: s.returnvstate, persuadetype: s.persuadetype, customerOrg: s.customerorg, designerorg: s.designerorg
     });
 }
 //清除查询内容
@@ -183,7 +183,7 @@ $(function () {
         var s = openPageData;
         grid.load({
             tid: s.tid, shopname: s.shop, buyer_nick: s.ww, orderState: s.state, customer: s.customer, finishdate1: s.finishdate1, finishdate2: s.finishdate2,
-            returndate1: s.returndate1, returndate2: s.returndate2, returnvstate: s.returnvstate, customerOrg: s.customerorg
+            returndate1: s.returndate1, returndate2: s.returndate2, returnvstate: s.returnvstate, customerOrg: s.customerorg, designerorg: s.designerorg
         });
         var form = new mini.Form("#ctl00_f_all");
         if (form != undefined && form != null) {