edit

SiteCore/Handler/taobaopush.cs

@@ -52,7 +52,7 @@ namespace SiteCore.Handler
                                                     queryTag, fstr2, fstr, "");
                     string tempStr = fstr;
                     XLog.ExecuteNonQuery(sql);
-                    Api_tmc_trade_info_Obj fullObj = null;
+                    /*Api_tmc_trade_info_Obj fullObj = null;
                     string res = "";
                     try
                     {
@@ -69,7 +69,7 @@ namespace SiteCore.Handler
 
                          sql = string.Format("INSERT INTO [dbo].[CE_ErpSukuraData](tid, json, type) VALUES ( '{0}', '{1}',{2});", tObj.refOid, tempStr, 0);
                         XLog.ExecuteNonQuery(sql);
-                    }
+                    }*/
                     //}
 
                     //lock (pushObj)

SiteCore/taobao/commonHelper.cs

@@ -3030,8 +3030,8 @@ namespace SiteCore
                 }
                 if (isIn)
                 {
-                    DbHelper.DbConn.ExecuteNonQuery(string.Format("insert into CE_ErpTradeLog(tid,orderstate,userid,operatetime,con) select ctid,{1},{2},getdate(),'{3}' from ce_erptradecell where tid={0} and OrderState=2 and DesignUserId=0 ;", dr["tid"].ToString(), (int)OrderState.下单完成, userId, "3自动派单" + userId));
-                    int rowCount = DbHelper.DbConn.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set OrderState=3,IsAutoDispatch=1,WaitDesignTime=getdate(),UpdateTime=getdate(),DesignUserId={0},DispatchSort=0 where tid={1} and OrderState=2 and DesignUserId=0", userId, dr["tid"].ToString()));
+                    int rowCount = DbHelper.DbConn.ExecuteNonQuery(string.Format("insert into CE_ErpTradeLog(tid,orderstate,userid,operatetime,con) select ctid,{1},{2},getdate(),'{3}' from ce_erptradecell where tid={0} and OrderState=2 and DesignUserId=0 ;", dr["tid"].ToString(), (int)OrderState.下单完成, userId, "3测试自动派单" + userId));
+                    //int rowCount = DbHelper.DbConn.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set OrderState=3,IsAutoDispatch=1,WaitDesignTime=getdate(),UpdateTime=getdate(),DesignUserId={0},DispatchSort=0 where tid={1} and OrderState=2 and DesignUserId=0", userId, dr["tid"].ToString()));
                     dayOrderReceive += rowCount;
                 }
             }

SiteCore/taobao/dataHelper.cs

@@ -389,7 +389,7 @@ namespace SiteCore.Handler
         public static void api_orderBack(string orderNumber, string state, string content)
         {
             string post_url = "http://api.presales.lingtao8.com/open/order/orderProcessReturn";
-           // string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
+            //string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
             string remoteInfo = "";
             string param = JsonConvert.SerializeObject(new
             {

SiteCore/taobao/designHelper.cs

@@ -278,7 +278,7 @@ namespace SiteCore.Handler
             PostVars.Add("receiverDistrict", ceErpTrade.receiver_district);
             PostVars.Add("receiverAddress", ceErpTrade.receiver_address);
             PostVars.Add("tids", ceErpTradeCell.ctid);
-            PostVars.Add("isOldUser", isOldCustomerText.ToString());
+            PostVars.Add("isOldlser", isOldCustomerText.ToString());
             PostVars.Add("sellerMemo", ceErpTradeCell.seller_memo);
             PostVars.Add("orderRemarks", ceErpTradeCell.seller_memo);
             PostVars.Add("isChange", isGai.ToString());

SiteCore/taobao/preSalesHelper.cs

@@ -2402,7 +2402,7 @@ namespace SiteCore.Handler
             ceErpTradeCell.isDianziOrder = isDianziOrder;
             ceErpTradeCellExtend.spu_id = spuId;
             ceErpTradeCellExtend = commonHelper.sendSpuData(ceErpTradeCell, ceErpTradeCellExtend);
-            returnSuccess("'" + ceErpTradeCellExtend.ToType + "'");
+            returnSuccess("\"" + ceErpTradeCellExtend.ToType + "\"");
             return;
         }
 

SiteCore/taobao/tmcHelper.cs

@@ -1030,6 +1030,13 @@ namespace SiteCore
                 }
 
             }
+            else
+            {
+                if (entity.OrderState == 0 && string.IsNullOrEmpty(entity.seller_memo))
+                {
+                    isSellerMemoChange = true;
+                }
+            }
             CeErpTradeCell.ExecuteNonQuery(string.Format("update CE_ErpTradeCell set UpdateTime = getdate() where tid = '{0}'", tObj.refOid));
             if (tObj.sellerMemo == "物料")
             {