修改彩印通售后逻辑

SiteCore/Handler/login.cs

@@ -192,7 +192,7 @@ namespace SiteCore.Handler
             string ip = WebHelper.GetIP();
             if (SiteInfo.isPassIp(ip) == false)
             {
-                if (!(entity != null && entity.State == 5))
+                if (!(entity != null && (entity.State == 5 || entity.State == 4)))
                 {
                     returnErrorMsg("未授权的IP：" + ip);
                     return;

SiteCore/Handler/sync.cs

@@ -193,7 +193,7 @@ namespace SiteCore.Handler
             string ip = WebHelper.GetIP();
             if (SiteInfo.isPassIp(ip) == false)
             {
-                if (!(entity != null && entity.State == 5))
+                if (!(entity != null && (entity.State == 5 || entity.State == 4)))
                 {
                     returnErrorMsg("未授权的IP：" + ip);
                     return;

SiteCore/Handler/sync.order.cs

@@ -6707,7 +6707,10 @@ namespace SiteCore.Handler
             string method = GetPostString("method");
             if (method.Length > 0) lw.Add(string.Format("AfterSaleMethod like '%{0}%'", method));
             string handler = GetPostString("handler");
-            if (handler.Length > 0) lw.Add(string.Format("AfterSaleName='{0}'", handler));
+            if (handler.Length > 0)
+            {
+                lw.Add(string.Format("AfterSaleName='{0}'", handler));
+            }
             string handledate1 = GetPostString("handledate1");
             string handledate2 = GetPostString("handledate2");
             string dwhandledate = GetDateMinuteWhere("HandleTime", handledate1, handledate2);
@@ -6824,8 +6827,6 @@ namespace SiteCore.Handler
                     }
 
                 }
-
-
                 string placedate1 = GetPostString("placedate1");
                 string placedate2 = GetPostString("placedate2");
                 string dwplace = GetDateMinuteWhere("FinishPlaceTime", placedate1, placedate2);
@@ -7950,7 +7951,7 @@ namespace SiteCore.Handler
                             ceErpTradeAfterSaleExtend.DisagreeTimeOut += 1;
                         }
                     }
-
+                    ceErpTradeAfterSaleExtend.DisagreeTime = null;
                     ceErpTradeAfterSaleExtend.Update();
                     entity.AfterSaleState = 2;
                     entity.UpdateTime = DateTime.Now;

SiteCore/taobao/apiCaiYingTong.cs

@@ -575,12 +575,14 @@ namespace SiteCore.Handler
                     CeErpTradeAfterSaleExtend ceErpTradeAfterSaleExtend = CeErpTradeAfterSaleExtend.getByTid(entity.ctid);
                     if (ceErpTradeAfterSaleExtend != null)
                     {
-
+                        ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
+                        ceErpTradeAfterSaleExtend.Update();
                     }
                     else
                     {
                         ceErpTradeAfterSaleExtend = new CeErpTradeAfterSaleExtend();
                         ceErpTradeAfterSaleExtend.tid = entity.ctid;
+                        ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
                         ceErpTradeAfterSaleExtend.Create();
                     }
                 }

Web/EAfterSale/AllAfterSale.aspx.cs

@@ -16,7 +16,7 @@ public partial class EAfterSale_AllAfterSale : BasePage
         }
         else
         {
-            _filterItem = "order,shop,state,wang,cus,des,fukuan,afterstate,reason,method,finish_time,aftertime,supState,place_time,supplier,responsible_man";
+            _filterItem = "order,shop,state,wang,cus,des,fukuan,afterstate,reason,method,finish_time,aftertime,supState,place_time,supplier,responsible_man,handler";
         }
 
         _filterDateBtn = true;

Web/EAfterSale/js/AllAfterSale.js

@@ -186,7 +186,7 @@ function searchFn() {
     //console.log("565656565", data);
     grid.load({
         ctid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, customer: s.customer, supplier: s.supplier, responsibleman: s.responsibleman, orderState: s.state, reason: s.reason, method: s.method, finishdate1: s.finishdate1, finishdate2: s.finishdate2, placedate1: s.placedate1, placedate2: s.placedate2,
-        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, afterstate: s.afterstate, handledate1: s.afterdate1, handledate2: s.afterdate2, supState: s.supState
+        date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, address: s.address, seller_memo: s.memo, afterstate: s.afterstate, handledate1: s.afterdate1, handledate2: s.afterdate2, supState: s.supState, handler: s.handler
     });
 }