zhuyiyi 9 months ago
parent
commit
75c6f27850

+ 1 - 1
BizCom/Dao/CeErpTradeResponsible.cs

@@ -138,7 +138,7 @@ namespace BizCom
 
         private int _type = 0;
         /// <summary>
-        /// 类型 0普通1供应商2物流3系统
+        /// 类型 0erp内部人1供应商2物流3系统
         /// </summary>
         [Property]
         public int type

+ 49 - 34
SiteCore/Handler/sync.order.cs

@@ -53,40 +53,6 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
-            /*string createtime = "2024-01-22 13:50:39.000";
-            string textContent = "";
-            int row_num = 100;
-            while (row_num == 100)
-            {
-                string conSql = string.Format("SELECT TOP 100 posCode, buyer_nick,pay_time FROM [dbo].[CE_ErpTrade] WHERE pay_time > '{0}' AND ( buyer_id IS NULL OR buyer_id = '' ) AND posCode != '' AND buyer_nick != '' ORDER By pay_time ASC", createtime);
-                DataTable table = DbHelper.DbConn.ExecuteDataset(conSql).Tables[0];
-                if (table != null)
-                {
-                    row_num = table.Rows.Count;
-                    foreach (DataRow row in table.Rows)
-                    {
-                        createtime = row["pay_time"].ToString();
-                        string buyerId = apiHelper.API_GetUserId(row["posCode"].ToString(), row["buyer_nick"].ToString());
-                        if (string.IsNullOrEmpty(buyerId))
-                        {
-                            continue;
-                        }
-                        textContent += string.Format("update [dbo].[CE_ErpTrade] set buyer_id='{2}'  WHERE posCode='{0}' and buyer_nick='{1}';\r\n", row["posCode"].ToString(), row["buyer_nick"].ToString(), buyerId);
-                    }
-                }
-                try
-                {
-                    StreamWriter fs = new StreamWriter("C:/Users/231010/Desktop/updateSql.txt", true);
-                    fs.WriteLine(textContent);
-                    fs.Close();
-                }
-                catch (Exception e)
-                {
-
-                }
-                textContent = "";
-            }*/
-
 
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
@@ -2483,6 +2449,39 @@ namespace SiteCore.Handler
             dStruct.Order = "IsReturn desc,isRefund desc,IsUrgency desc, pay_time desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_erptradecell", dStruct);
+            dt.Columns.Add(new DataColumn("gongchuang", typeof(string)));
+            if (dt != null && dt.Rows.Count > 0)
+            {
+                foreach (DataRow dr in dt.Rows)
+                {
+                    try
+                    {
+                        // 对象操作
+                        CeErpTradeCell ceErpTradeCell = new CeErpTradeCell();
+                        ceErpTradeCell.ctid = dr["ctid"].ToString();
+                        ceErpTradeCell.seller_memo = dr["seller_memo"].ToString();
+                        ceErpTradeCell.ShopId = Convert.ToInt32(dr["ShopId"]);
+                        ceErpTradeCell.ProductId = Convert.ToInt32(dr["ProductId"]);
+                        if (dStruct.PageSize != 100000)
+                        {
+                            if (dr["DispatchSort"].ToString() == "2")
+                            {
+                                dr["gongchuang"] = 200;
+                            }
+                            else
+                            {
+                                designApiResponseVo response = commonHelper.checkOrderListDesignInfo(dr["tid"].ToString());
+                                dr["gongchuang"] = response.code;
+                            }
+                        }
+                    }
+                    catch (NullReferenceException ex)
+                    {
+
+                    }
+
+                }
+            }
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }
 
@@ -4665,6 +4664,10 @@ namespace SiteCore.Handler
                         commonHelper.UpdateRelationOrder(entity.ctid);
                         commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, dcomcode, outSid);
                         CeErpSukuraData.createInfo(entity.ctid, 4);
+                        if (entity.SupplierId == 64)
+                        {
+                            commonHelper.sendCytExpress(exinfo);
+                        }
                         //CeErpDataSendOrderInfo.createObject(entity.ctid);
                         LogHelper.addLog(entity.ctid, CurrentUser.UserID, "发货-" + comName + "-" + outSid, entity.OrderState);
                     }
@@ -5548,6 +5551,10 @@ namespace SiteCore.Handler
                             commonHelper.UpdateRelationOrder(entity.ctid);
                             CeErpSukuraData.createInfo(ctid, 4);
                             commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode);
+                            if (entity.SupplierId == 64)
+                            {
+                                commonHelper.sendCytExpress(exinfo);
+                            }
                             LogHelper.addLog(ctid, CurrentUser.UserID, "发货成功-" + cpCode + "-" + curUseWayBillCode);
                             //CeErpDataSendOrderInfo.createObject(entity.ctid);
 
@@ -5587,6 +5594,10 @@ namespace SiteCore.Handler
                         exinfo.Create();
                         commonHelper.UpdateRelationOrder(entity.ctid);
                         CeErpSukuraData.createInfo(entity.ctid, 4);
+                        if (entity.SupplierId == 64)
+                        {
+                            commonHelper.sendCytExpress(exinfo);
+                        }
                         if (isTogether == "1")
                         {
                             StringBuilder sqlsb = new StringBuilder();
@@ -5690,6 +5701,10 @@ namespace SiteCore.Handler
                     exinfo.print_time = DateTime.Now;
                     exinfo.printUser = CurrentUser.UserName;
                     exinfo.Create();
+                    if (entity.SupplierId == 64)
+                    {
+                        commonHelper.sendCytExpress(exinfo);
+                    }
                     //CeErpDataSendOrderInfo.createObject(entity.ctid);
                 }
                 LogHelper.addLog(ctid, CurrentUser.UserID, "菜鸟打单-" + cpCode + "-" + outsid);

+ 4 - 1
SiteCore/taobao/apiDesign.cs

@@ -307,7 +307,7 @@ namespace SiteCore.Handler
                 isGai = true;
             }
             CeErpTrade ceErpTrade = CeErpTrade.Get(ceErpTradeCell.tid);
-           
+
             CeErpShop ceErpShop = CeErpShop.Get(ceErpTradeCell.ShopId);
             string design_app_id = "";
             string design_secret = "";
@@ -668,6 +668,7 @@ namespace SiteCore.Handler
                             ceErpTradeCell.StartDesignTime = DateTime.Now;
                         }
                         ceErpTradeCell.Update();
+                        LogHelper.addLog(ceErpTradeCell.ctid, CurrentUser.UserID, "接口请求:" + orderState, ceErpTradeCell.OrderState);
                         commonHelper.UpdateRelationOrder(tid);
                         return;
                     }
@@ -736,6 +737,7 @@ namespace SiteCore.Handler
                 {
                     ct.Create();
                 }
+                LogHelper.addLog(ce.ctid, CurrentUser.UserID, "接口请求修改:" + content, ce.OrderState);
                 returnSuccessMsg("保存成功!");
             }
         }
@@ -764,6 +766,7 @@ namespace SiteCore.Handler
                 entity.ReturnTime = DateTime.Now;
                 entity.ReturnReason = content;
                 entity.Update();
+                LogHelper.addLog(entity.ctid, CurrentUser.UserID, "接口打回:" + content, entity.OrderState);
                 returnSuccessMsg("保存成功!");
                 return;
             }

+ 6 - 4
SiteCore/taobao/apiHelper.cs

@@ -8,6 +8,7 @@ using System.Data;
 using System.Security.Cryptography;
 using System.Text;
 using System.Web;
+using static SiteCore.taoObj.api_userId_response;
 
 namespace SiteCore
 {
@@ -438,7 +439,7 @@ namespace SiteCore
             return res;
         }
 
-        public static string API_GetUserId(string waybillCode, string nickName)
+        public static List<ContentItem> API_GetUserId(string waybillCode, string nickName)
         {
             var res_obj = new
             {
@@ -448,16 +449,17 @@ namespace SiteCore
             string ro_json = JsonConvert.SerializeObject(res_obj);
 
             string res = Base_Request(ro_json, "ds.tb.user.openuid.get");
+            List<ContentItem> resultList = new List<ContentItem>();
             if (res == "")
             {
-                return "";
+                return resultList;
             }
             try
             {
                 api_userId_response api = JsonConvert.DeserializeObject<api_userId_response>(res);
                 if (api != null && api.response.code == 200 && api.response.data.content != null && api.response.data.content.Count > 0)
                 {
-                    return api.response.data.content[0].buyerOpenUid;
+                    resultList = api.response.data.content;
                 }
             }
             catch (Exception ex)
@@ -465,7 +467,7 @@ namespace SiteCore
 
             }
 
-            return "";
+            return resultList;
         }
 
     }

+ 183 - 78
SiteCore/taobao/commonHelper.cs

@@ -23,6 +23,9 @@ using NHibernate.Loader.Custom;
 using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using NPOI.OpenXmlFormats.Shared;
 using static SiteCore.taoObj.work_core_vo;
+using System.Linq;
+using NHibernate.Mapping;
+using System.Reflection.Emit;
 
 namespace SiteCore
 {
@@ -1758,6 +1761,80 @@ namespace SiteCore
 
         }
 
+        public static void getuserId()
+        {
+            string createtime = "2024-01-22 13:50:39.000";
+            string textContent = "";
+            int row_num = 100;
+            Dictionary<string, List<string>> shop_userNick = new Dictionary<string, List<string>>();
+            while (row_num == 100)
+            {
+                string conSql = string.Format("SELECT TOP 100 posCode, buyer_nick,pay_time FROM [dbo].[CE_ErpTrade] WHERE pay_time > '{0}' AND ( buyer_id IS NULL OR buyer_id = '' ) AND posCode != '' AND buyer_nick != '' ORDER By pay_time ASC", createtime);
+                DataTable table = DbHelper.DbConn.ExecuteDataset(conSql).Tables[0];
+                if (table != null)
+                {
+                    row_num = table.Rows.Count;
+                    foreach (DataRow row in table.Rows)
+                    {
+                        string posCode = row["posCode"].ToString();
+                        string buyer_nick = row["buyer_nick"].ToString();
+                        createtime = row["pay_time"].ToString();
+                        List<string> userNickName = new List<string>();
+                        if (shop_userNick.ContainsKey(posCode))
+                        {
+                            shop_userNick.TryGetValue(posCode, out userNickName);
+                        }
+                        userNickName.Add(buyer_nick);
+                        userNickName = userNickName.Distinct().ToList();
+                        if (userNickName.Count == 10)
+                        {
+                            sendApi(posCode, userNickName);
+                            userNickName = new List<string>();
+                        }
+                        if (shop_userNick.ContainsKey(posCode))
+                        {
+                            shop_userNick[posCode] = userNickName;
+                        }
+                        else
+                        {
+                            shop_userNick.Add(posCode, userNickName);
+                        }
+                    }
+                }
+
+            }
+            foreach (string key in shop_userNick.Keys)
+            {
+                List<string> nameList = shop_userNick[key];
+                sendApi(key, nameList);
+            }
+
+        }
+        static void sendApi(string posCode, List<string> userNickName)
+        {
+            string textContent = "";
+            List<api_userId_response.ContentItem> buyerIds = apiHelper.API_GetUserId(posCode, string.Join(",", userNickName));
+            if (buyerIds != null && buyerIds.Count > 0)
+            {
+                foreach (api_userId_response.ContentItem item in buyerIds)
+                {
+                    if (item != null && !string.IsNullOrEmpty(item.buyerOpenUid))
+                    {
+                        textContent += string.Format("update [dbo].[CE_ErpTrade] set buyer_id='{2}'  WHERE posCode='{0}' and buyer_nick='{1}';\r\n", posCode, item.buyerNick, item.buyerOpenUid);
+                    }
+                }
+                try
+                {
+                    StreamWriter fs = new StreamWriter("C:/Users/231010/Desktop/updateSql.txt", true);
+                    fs.WriteLine(textContent);
+                    fs.Close();
+                }
+                catch (Exception e)
+                {
+
+                }
+            }
+        }
         public static designApiResponseVo checkOrderListDesignInfo(string tid)
         {
             if (string.IsNullOrEmpty(tid))
@@ -1802,6 +1879,7 @@ namespace SiteCore
             return new designApiResponseVo(-1, check_info);
         }
         static List<int> products = new List<int>() { 29, 2489, 2517, 2518, 2519, 2520, 2533, 2534, 2558, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, 2634, 2644, 2645, 2646, 2648, 2649, 2650 };
+        static List<int> shops = new List<int>() { 2, 77, 121, 122, 65, 87, 26, 45, 17, 21, 52, 54, 103, 107, 108, 109, 118, 63, 64, 66, 49, 67, 105, 35, 57, 29, 53, 62 };
         public static designApiResponseVo checkOrderDesignInfo(CeErpTradeCell ceErpTradeCell, string post = "")
         {
             if (ceErpTradeCell.DispatchSort == 2)
@@ -1855,105 +1933,105 @@ namespace SiteCore
                     int min_num = 2;
 
                     int num = 0;
-                    /*if (a < 15)//限制不是全品的店铺限制
-                    {*/
-                    /*if (ceErpTradeCell.payment >= 500)
-                    {
-                        return new designApiResponseVo(-1, "订单价格超出");
-                    }*/
-                    string pattern = @"\b(\d{1,5}[x\*]\d{1,5}(mm|cm))\b";
-                    string memo = ceErpTradeCell.seller_memo.Replace("MM", "mm").Replace("CM", "cm");
-                    Regex reg = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Multiline, TimeSpan.FromSeconds(2));//2秒后超时
-                    MatchCollection matches = reg.Matches(memo);//设定要查找的字符串
-                    string size = "";
-                    double min_width = 90;
-                    double min_height = 90;
-                    double width = 0;
-                    double height = 0;
-                    try
+                    if (shops.IndexOf(ceErpTradeCell.ShopId) == -1)//限制不是全品的店铺限制
                     {
-                        num = matches.Count;
-                        foreach (System.Text.RegularExpressions.Match match in matches)
+                        /*if (ceErpTradeCell.payment >= 500)
+                        {
+                            return new designApiResponseVo(-1, "订单价格超出");
+                        }*/
+                        string pattern = @"\b(\d{1,5}[x\*]\d{1,5}(mm|cm))\b";
+                        string memo = ceErpTradeCell.seller_memo.Replace("MM", "mm").Replace("CM", "cm");
+                        Regex reg = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptions.Multiline, TimeSpan.FromSeconds(2));//2秒后超时
+                        MatchCollection matches = reg.Matches(memo);//设定要查找的字符串
+                        string size = "";
+                        double min_width = 90;
+                        double min_height = 90;
+                        double width = 0;
+                        double height = 0;
+                        try
                         {
-                            if (match.Success)
+                            num = matches.Count;
+                            foreach (System.Text.RegularExpressions.Match match in matches)
                             {
-                                size = match.Groups[0].Value;
-                                if (size.Contains("cm"))
+                                if (match.Success)
                                 {
-                                    size = size.Replace("cm", "");
-                                    string[] size_list = size.Split('x');
-                                    if (size_list.Length > 1)
+                                    size = match.Groups[0].Value;
+                                    if (size.Contains("cm"))
                                     {
-                                        width = Convert.ToDouble(size_list[0]) * 10;
-                                        height = Convert.ToDouble(size_list[1]) * 10;
+                                        size = size.Replace("cm", "");
+                                        string[] size_list = size.Split('x');
+                                        if (size_list.Length > 1)
+                                        {
+                                            width = Convert.ToDouble(size_list[0]) * 10;
+                                            height = Convert.ToDouble(size_list[1]) * 10;
+                                        }
                                     }
-                                }
-                                else if (size.Contains("mm"))
-                                {
-                                    size = size.Replace("mm", "");
-                                    string[] size_list = size.Split('x');
-                                    if (size_list.Length > 1)
+                                    else if (size.Contains("mm"))
                                     {
-                                        width = Convert.ToDouble(size_list[0]);
-                                        height = Convert.ToDouble(size_list[1]);
+                                        size = size.Replace("mm", "");
+                                        string[] size_list = size.Split('x');
+                                        if (size_list.Length > 1)
+                                        {
+                                            width = Convert.ToDouble(size_list[0]);
+                                            height = Convert.ToDouble(size_list[1]);
+                                        }
                                     }
-                                }
 
-                                if (width >= min_width && height >= min_height && height >= min_width && width >= min_height)
-                                {
-                                    size_bool = true;
-                                    break;
-                                }
-                                else
-                                {
-                                    size_bool = false;
+                                    if (width >= min_width && height >= min_height && height >= min_width && width >= min_height)
+                                    {
+                                        size_bool = true;
+                                        break;
+                                    }
+                                    else
+                                    {
+                                        size_bool = false;
+                                    }
                                 }
                             }
                         }
-                    }
-                    catch (Exception ex)
-                    {
-
-                    }
-                    if (ceErpTradeCell.seller_memo.Contains("刮刮"))
-                    {
-                        num = Math.Max(num - 1, 1);
-                    }
-                    pattern = @"(\d+)款";
-                    matches = Regex.Matches(ceErpTradeCell.seller_memo, pattern);
-                    try
-                    {
-                        num = Math.Max(num - matches.Count, 0);
+                        catch (Exception ex)
+                        {
 
-                        foreach (System.Text.RegularExpressions.Match match in matches)
+                        }
+                        if (ceErpTradeCell.seller_memo.Contains("刮刮"))
+                        {
+                            num = Math.Max(num - 1, 1);
+                        }
+                        pattern = @"(\d+)款";
+                        matches = Regex.Matches(ceErpTradeCell.seller_memo, pattern);
+                        try
                         {
-                            if (match.Success)
+                            num = Math.Max(num - matches.Count, 0);
+
+                            foreach (System.Text.RegularExpressions.Match match in matches)
                             {
-                                num += Convert.ToInt32(match.Groups[1].Value);
-                                break;
+                                if (match.Success)
+                                {
+                                    num += Convert.ToInt32(match.Groups[1].Value);
+                                    break;
+                                }
                             }
                         }
-                    }
-                    catch (Exception ex)
-                    {
+                        catch (Exception ex)
+                        {
 
-                    }
-                    //2款不进
-                    if (num < min_num)
-                    {
-                        num_bool = false;
-                    }
+                        }
+                        //2款不进
+                        if (num < min_num)
+                        {
+                            num_bool = false;
+                        }
 
-                    if (!num_bool && !size_bool)
-                    {
-                        return new designApiResponseVo(-1, "尺寸小于90x90或款数小于2");
+                        if (!num_bool && !size_bool)
+                        {
+                            return new designApiResponseVo(-1, "尺寸小于90x90或款数小于2");
+                        }
                     }
-                    /*}*/
                 }
             }
             return new designApiResponseVo(200, "");
         }
-
+        private static string cytUserId = "77886";
         public static void sendCytAfterSale(CeErpTradeCell entity)
         {
             try
@@ -1979,7 +2057,7 @@ namespace SiteCore
                 }
                 JObject jsonObject12 = new JObject
                             {
-                                { "Userid", "77886" },
+                                { "Userid",cytUserId },
                                 //{ "pwd", "lt666888" },
                                 { "LTOrderId", entity.ctid },
                                 { "RefundType", refund_type },
@@ -2008,6 +2086,33 @@ namespace SiteCore
 
         }
 
+        public static void sendCytExpress(CeErpExpressInfo exinfo)
+        {
+            try
+            {
+                if (exinfo == null)
+                {
+                    return;
+                }
+                JObject jsonObject12 = new JObject
+                            {
+                                { "Userid",cytUserId },
+                                //{ "pwd", "lt666888" },
+                                { "LTOrderId", exinfo.tid },
+                                { "CourierNumber", exinfo.out_sid },
+                                { "ExpressCompanyName", exinfo.company_name }
+                            };
+                string response1 = HttpPost("http://www.kiy.cn/webapi/Himall.NewShop.UpdOrderExpress", jsonObject12.ToString());
+                JObject jsonObjects1 = JObject.Parse(response1);
+                string msg = (string)jsonObjects1["msg"];
+                LogHelper.addLog(exinfo.tid, 0, "CYT售后单推送:" + msg);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.addLog(exinfo.tid, 0, "CYT售后单推送:" + ex.ToString());
+            }
+        }
+
         public static void getCytPrice(CeErpTradeCell entity)
         {
             try
@@ -2022,7 +2127,7 @@ namespace SiteCore
                 {
                     JObject jsonObject12 = new JObject
                     {
-                        { "UserId", "77886" },
+                        { "UserId", cytUserId },
                         { "Pwd", "lt666888" },
                         { "Filename", entity.seller_memo }
                     };
@@ -2058,7 +2163,7 @@ namespace SiteCore
 
                 JObject jsonObject = new JObject
                     {
-                         { "UserId", "77886" },
+                         { "UserId", cytUserId },
                         { "Pwd", "lt666888" },
                         { "Filename", chanp }
                     };

+ 72 - 1
SiteCore/taobao/preSalesHelper.cs

@@ -954,6 +954,77 @@ namespace SiteCore.Handler
             }
             returnErrorMsg("缺少必要的参数id");
         }
+        public void upd_erp_masteraftersale()
+        {
+            if (UrlPostParmsCheck("id"))
+            {
+                string id = GetPostString("id");
+                int st = GetPostInt("afterstate");
+                string afmemo = GetPostString("supmemo");
+                string image = GetPostString("image");
+                string textResult = GetPostString("textResult");
+                int UserID = GetPostInt("UserID");
+                CeErpTradeResponsible ceErpTradeResponsible = CeErpTradeResponsible.GetById(id);
+                if (ceErpTradeResponsible != null)
+                {
+                    ceErpTradeResponsible.VerifyState = st == 1 ? 3 : 0;
+                    ceErpTradeResponsible.VerifyTime = DateTime.Now;
+                    ceErpTradeResponsible.Update();
+
+                    CeErpTradeCell entity = CeErpTradeCell.GetByCtid(ceErpTradeResponsible.tid);
+                    if (entity != null)
+                    {
+                        entity.AfterSaleSupplierState = st;
+                        entity.AfterSaleSupplierMemo = afmemo;
+
+                        if (st == 1)
+                        {
+                        }
+                        else
+                        {
+                            CeErpTradeResponsible.dateByTid(entity.ctid);
+
+                            //退回到售后
+                            string numSql = string.Format("SELECT COUNT ( * ) AS BackNum FROM dbo.Ce_ErpTradeAfterSaleLog WHERE tid = '{0}' AND Con in ('责任主管不认可','供应商不认可')", ceErpTradeResponsible.tid);
+                            DataTable dt = DbHelper.DbConn.ExecuteDataset(numSql).Tables[0];
+                            int num = Convert.ToInt32(dt.Rows[0]["BackNum"]);
+                            if (num <= 1)
+                            {
+                                entity.AfterSaleState = 1;
+                            }
+                            else
+                            {
+                                entity.AfterSaleState = 5;
+                            }
+
+                            CeErpTradeAfterSaleExtend ceErpTradeAfterSaleExtend = CeErpTradeAfterSaleExtend.getByTid(entity.ctid);
+                            if (ceErpTradeAfterSaleExtend != null)
+                            {
+                                ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
+                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
+                                ceErpTradeAfterSaleExtend.Update();
+                            }
+                            else
+                            {
+                                ceErpTradeAfterSaleExtend = new CeErpTradeAfterSaleExtend();
+                                ceErpTradeAfterSaleExtend.tid = entity.ctid;
+                                ceErpTradeAfterSaleExtend.AfterSaleBackImg = image;
+                                ceErpTradeAfterSaleExtend.DisagreeTime = DateTime.Now;
+                                ceErpTradeAfterSaleExtend.Create();
+                            }
+                        }
+
+                        entity.Update();
+                        returnSuccessMsg("操作成功!");
+                        LogHelper.addLog(entity.ctid, UserID, "责任主管" + (st == 1 ? "认可" : ("不认可," + afmemo)), 0, 3);
+                        LogHelper.AddAfterSaleLog(entity.ctid, Convert.ToInt32(id), "责任主管" + (st == 1 ? "认可" : "不认可"), UserID, st == 1 ? 0 : 1, afmemo, image);
+                        return;
+                    }
+                }
+
+                returnErrorMsg("找不到订单记录");
+            }
+        }
 
         public void save_erp_billinfo()
         {
@@ -2003,7 +2074,7 @@ namespace SiteCore.Handler
                     ApiVo apiVo = new ApiVo();
                     apiVo.actionName = "closeDesign";
                     apiVo.orderNumber = bizOrder.thirdOrderId;
-                    designHelper.API_WorkCore(apiVo);//closeDesign
+                    //designHelper.API_WorkCore(apiVo);//closeDesign
                     LogHelper.addLog(bizOrder.thirdOrderId, 0, "交易关闭", (int)OrderState.交易关闭);
                     // commonHelper.updateOrderStateForShipped(tObj.refOid, (int)OrderState.交易关闭, "updatestate_close");
                     // removeOldCustomerInfo(trade);

+ 1 - 1
SiteCore/taobao/tmcHelper.cs

@@ -594,7 +594,7 @@ namespace SiteCore
                     ApiVo apiVo = new ApiVo();
                     apiVo.actionName = "closeDesign";
                     apiVo.orderNumber = tObj.refOid;
-                    designHelper.API_WorkCore(apiVo);//closeDesign
+                    //designHelper.API_WorkCore(apiVo);//closeDesign
                     LogHelper.addLog(tObj.refOid, 0, "交易关闭", (int)OrderState.交易关闭);
                     // commonHelper.updateOrderStateForShipped(tObj.refOid, (int)OrderState.交易关闭, "updatestate_close");
                     // removeOldCustomerInfo(trade);

+ 2 - 1
Web/EFinance/StayGoods.aspx

@@ -28,8 +28,9 @@
                 <div type="checkcolumn" width="20"></div>
                 <div field="tid" width="90" align="center" headeralign="center" renderer="orderIdRenderer">订单编号</div>
                 <div field="shop_name" width="80" align="center" headeralign="center" renderer="orderPTimeRenderer">店铺</div>
-                <div field="wangwang" width="80" align="center" headeralign="center">旺旺</div>
+                <div field="wangwang" width="80" align="center" visible="false" headeralign="center">旺旺</div>
                 <div field="OrderState" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
+                <div field="seller_memo" width="50" align="center" headeralign="center">文件名</div>
                 <div field="payment" width="80" align="center" headeralign="center">订单金额</div>
                 <div field="RefundFee" width="80" align="center" headeralign="center">退款金额</div>
                 <div field="pay_time" width="80" align="center" headeralign="center" renderer="payTimeRenderer">支付时间</div>