edit

SiteCore/taoObj/dataTokenBean.cs

@@ -15,5 +15,6 @@ namespace SiteCore.taoObj
 
         public string access_token { get; set; }
         public string token_type { get; set; }
+        public string exp { get; set; }
     }
 }

SiteCore/taobao/dataHelper.cs

@@ -410,7 +410,11 @@ namespace SiteCore.Handler
                 XLog.SaveLog(0, "api_orderBack:" + ex.Message);
             }
         }
-
+        public static long GetTimeStamp()
+        {
+            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
+            return Convert.ToInt64(ts.TotalSeconds);
+        }
 
         public static string getToken()
         {
@@ -419,7 +423,16 @@ namespace SiteCore.Handler
             if (RedisHelper.HasKey("xclient_token"))
             {
                 token = RedisHelper.StringGet("xclient_token").ToString();
-                return token;
+                if (RedisHelper.HasKey("token_end"))
+                {
+                    string token_end = RedisHelper.StringGet("token_end").ToString();
+                    long token_endtime = Convert.ToInt64(token_end);
+                    long currentTime = GetTimeStamp();
+                    if (currentTime >= token_endtime)
+                    {
+                        return token;
+                    }
+                }
             }
             string post_url = pUrl + "oauth/token";
             WebClient wc = new WebClient();
@@ -438,7 +451,9 @@ namespace SiteCore.Handler
                 //remoteInfo = "{\"access_token\":\"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiYXBpIl0sInNjb3BlIjpbInJlYWQiLCJ3cml0ZSJdLCJleHAiOjE3MjM3OTk0MTUsImF1dGhvcml0aWVzIjpbIm9wZW5hcGkiXSwianRpIjoiZjdhOGVjNmMtOWUyMS00MDZhLWEzNzktYjI0MTU3OTE0ODJmIiwiY2xpZW50X2lkIjoieGNsaWVudCJ9.EL-El6M9AVXvH_hp9E4wqM17sHwynyJBDcZJHYw4AYdJrYAWHEu78-Gn3Hj4FyfDaIkqNk641XSAfVpTiH_sFeTSl8-glSJEeD7OFKSkoJjrj0_Ft7kFZZs0XAhbgo4m5rI3Qbeq_87_0K5wKqRcygjUee82MFcIDueTcUg3p9c\",\"token_type\":\"bearer\",\"expires_in\":2052,\"scope\":\"read write\",\"jti\":\"f7a8ec6c-9e21-406a-a379-b2415791482f\",\"aud\":[\"api\"],\"exp\":1723799415,\"authorities\":[\"openapi\"],\"client_id\":\"xclient\"}";
                 dataTokenBean dataTokenBean = JsonConvert.DeserializeObject<dataTokenBean>(remoteInfo);
                 token = dataTokenBean.access_token;
-                RedisHelper.StringSet("xclient_token", token, new TimeSpan(0, 15, 0));
+                string timeEnd = dataTokenBean.exp;
+                RedisHelper.StringSet("xclient_token", token);
+                RedisHelper.StringSet("token_end", timeEnd);
             }
             catch (Exception ex)
             {

SiteCore/taobao/designHelper.cs

@@ -58,7 +58,7 @@ namespace SiteCore.Handler
             }
         }
         static string pUrl = "http://api.lingtao8.com/api/manager/";
-        //static string pUrl = "http://47.122.40.91:8099/api/manager/";
+        // static string pUrl = "http://47.122.40.91:8099/api/manager/";
 
         static HttpHelper tb_http = new HttpHelper();
 

SiteCore/taobao/tmcHelper.cs

@@ -788,6 +788,7 @@ namespace SiteCore
                             ceErpTradeSpu = new CeErpTradeSpu();
                             ceErpTradeSpu.spuId = order.spu_id;
                             ceErpTradeSpu.tid = order.tid;
+                            ceErpTradeSpu.shopId = shopId;
                             ceErpTradeSpu.createTime = DateTime.Now;
                             dataSendSpuBean bean = new dataSendSpuBean();
                             bean.ShortText1728890680485 = order.title;

Web/EOrder/OrderList.aspx.cs

@@ -8,7 +8,7 @@ public partial class EOrder_OrderList : BasePage
         _repTitle = "订单列表";
         PmTag = "orderlist";
         //_selfCheckPermission = true;
-        _filterItem = "order,shop,wang,fukuan,moeny,memo,cus,des,state,oldcus,assign_time,addwechat,upload_time,finish_time,backreason,isNewSearch,overtime,delivery_time";
+        _filterItem = "order,shop,wang,fukuan,moeny,memo,cus,des,state,oldcus,assign_time,addwechat,upload_time,finish_time,backreason,isNewSearch,overtime,delivery_time,spudata";
         _keyFilterVisible = false;
         _addVisible = false;
     }

Web/EOrder/js/p_order.js

@@ -176,7 +176,7 @@ function searchFn() {
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, customer: s.customer, design: s.design, orderState: s.state, addwechat: s.addwechat,
         date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, isoldcus: s.isoldcus, apdate1: s.assigndate1, apdate2: s.assigndate2
         , uploaddate1: s.uploaddate1, uploaddate2: s.uploaddate2, finishdate1: s.finishdate1, finishdate2: s.finishdate2, urgent: urgent, back: back, offlineSearch: offlineSearch, backReason: s.backreason, isNew: isNewSearch,
-        overtime: s.overtime, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2
+        overtime: s.overtime, deliverydate1: s.deliverydate1, deliverydate2: s.deliverydate2, spudata: s.spudata
     }
     grid.load(parmsObj);
 

Web/MasterPage/ErpView.master

@@ -558,6 +558,14 @@
                     <option value="1">设计超时</option>
                 </select>
             </div>
+            <div class="filter_item" id="f_spudata" runat="server" visible="false">
+                <label>spu</label>
+                <select class="mini-combobox inp_middle" name="spudata" id="txtSpudata">
+                    <option value=""></option>
+                    <option value="1">已绑定</option>
+                    <option value="0">未绑定</option>
+                </select>
+            </div>
             <div class="filter_item" id="f_refundstate" runat="server" visible="false">
                 <label>退款状态</label>
                 <select class="mini-combobox inp_middle" name="refundState" id="textRefundState">

Web/MasterPage/ErpView.master.cs

@@ -157,6 +157,7 @@ public partial class MasterPage_ErpView : System.Web.UI.MasterPage
                 if (fArr.Contains("aftersakereason")) f_aftersakereason.Visible = true;//
                 if (fArr.Contains("overtime")) f_overtime.Visible = true;//
                 if (fArr.Contains("refundstate")) f_refundstate.Visible = true;//退款状态
+                if (fArr.Contains("spudata")) f_spudata.Visible = true;//退款状态
 
             }
             else