新增退款客服查询

SiteCore/Handler/sync.order.cs

@@ -77,7 +77,7 @@ namespace SiteCore.Handler
             //CeErpTradeCell entity = CeErpTradeCell.GetByCtid("2811249339088067154");
             //int sid = commonHelper.autoDistributeToSupplier(entity);
             // string a  = apiHelper.API_GetPrintData("YT8951457355085");
-            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1774497492000,\"deliveryType\":\"OFFLINE\",\"discountFee\":10.0,\"flag\":\"NONE\",\"latestDeliveryTime\":1774670288000,\"lines\":[{\"dividePostFee\":0.0,\"latestDeliveryTime\":1774670288000,\"mark2\":[],\"num\":1,\"outerId\":\"\",\"payment\":20.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i3/490100363/O1CN01ZRXU6I1EYIqUFpQiQ_!!490100363.jpg\",\"platServiceFee\":0.0,\"price\":30.0,\"refOlId\":\"4502210869057006849\",\"refSkuId\":\"0\",\"refSpuId\":\"952810977790\",\"refundStatus\":\"NO_REFUND\",\"sellPrice\":20.0,\"singleFee\":20.0,\"spuOuterId\":\"\",\"standards\":\"\",\"status\":\"NOT_SHIPPED\",\"title\":\"书签伴手礼卡片定制新生开学活动门票名校录取旅游纪念文创种子纸\",\"totalFee\":20.0,\"totalPrice\":30.0,\"totalSellPrice\":20.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1774507193000,\"openBuyerId\":\"AAE6RHraABkUZRPgSx0IGz_b\",\"openBuyerNick\":\"d**\",\"openSellerNick\":\"琳19890725\",\"orderSource\":\"SYNC\",\"orderTime\":1774497487000,\"payTime\":1774497488000,\"payment\":20.0,\"platServiceFee\":0.0,\"posCode\":\"guliang\",\"posId\":598696,\"postFee\":0.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"果洛藏族自治州\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"甘德县\",\"receiverId\":\"a021203bdc34cc621cb23368e6f3d409$\",\"receiverState\":\"青海省\",\"receiverTown\":\"柯曲镇\",\"refOid\":\"4502210869057006849\",\"refType\":\"TMALL\",\"refundStatus\":\"NO_REFUND\",\"sellerMemo\":\"配件-10x10mm-500个-流苏-djj娟娟女王-迷菇凉\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"sysTags\":[],\"totalFee\":20.0,\"totalPrice\":30.0,\"totalSellPrice\":20.0,\"type\":\"SALE\"}}");
+            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1776912122000,\"deliveryType\":\"OFFLINE\",\"discountFee\":5.0,\"flag\":\"NONE\",\"latestDeliveryTime\":1777564800000,\"lines\":[{\"dividePostFee\":0.0,\"latestDeliveryTime\":1777564799999,\"mark2\":[],\"num\":7,\"outerId\":\"\",\"payment\":65.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i4/490100363/O1CN014sHEYw1EYItkQ1CXw_!!490100363.jpg\",\"platServiceFee\":0.0,\"price\":10.0,\"refOlId\":\"3297756000720015269\",\"refSkuId\":\"0\",\"refSpuId\":\"1013527964388\",\"refundStatus\":\"NO_REFUND\",\"sellPrice\":9.2857,\"singleFee\":9.29,\"spuOuterId\":\"\",\"standards\":\"\",\"status\":\"NOT_SHIPPED\",\"title\":\"车贴定制宠物logo图案转印贴纸小狗diy创意商标车窗萌宠水晶标签\",\"totalFee\":65.0,\"totalPrice\":70.0,\"totalSellPrice\":65.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1776913673000,\"openBuyerId\":\"AAG5RHraABkUZRPgSx3AaocL\",\"openBuyerNick\":\"绿**\",\"openSellerNick\":\"琳19890725\",\"orderSource\":\"SYNC\",\"orderTime\":1776912119000,\"payTime\":1776912120000,\"payment\":65.0,\"platServiceFee\":0.0,\"posCode\":\"guliang\",\"posId\":598696,\"postFee\":0.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"大连市\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"甘井子区\",\"receiverId\":\"84b8064ffac769db909772facb5e84fb$\",\"receiverState\":\"辽宁省\",\"receiverTown\":\"凌水街道\",\"refOid\":\"3297756000720015269\",\"refType\":\"TMALL\",\"refundStatus\":\"NO_REFUND\",\"sellerMemo\":\"120x120mm+120x150mm-2款各1个-UV转印贴-彩色-模切-绿葡萄妲己-龙井\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"sysTags\":[],\"totalFee\":65.0,\"totalPrice\":70.0,\"totalSellPrice\":65.0,\"type\":\"SALE\"}}");
             //refundTmcHelper.Api_TmcRefundMsg("{\"content\":{\"afterStatus\":\"SUCCESS\",\"createTime\":1735287446000,\"desc\":\"\",\"interceptInvestor\":\"NONE\",\"interceptStatus\":\"NONE\",\"interceptType\":\"NONE\",\"lines\":[{\"num\":2,\"outerId\":\"\",\"price\":50.0,\"refAid\":\"313001208133750610\",\"refAlId\":\"313001208133750610\",\"refBoughtSkuId\":\"\",\"refOid\":\"4181722704291751006\",\"refOlId\":\"4181722704291751006\",\"refSkuId\":\"0\",\"refSpuId\":\"865893808768\",\"refundFee\":98.86,\"refundStatus\":\"SUCCESS\",\"title\":\"新年会抽奖券定制2025蛇年公司活动正副可撕代金券打印纪念票根奖品兑换尾牙晚宴邀请卡号码牌创意入场券设计\",\"totalFee\":98.86,\"type\":1}],\"logisticsCompany\":\"\",\"logisticsOrderNo\":\"\",\"mark2\":[],\"openBuyerNick\":\"0**\",\"openSellerNick\":\"万慕办公旗舰店\",\"posCode\":\"wanmu\",\"posId\":598798,\"reason\":\"订单信息拍错（规格/尺码/颜色等）\",\"receiverCity\":\"\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"\",\"receiverId\":\"\",\"receiverState\":\"\",\"receiverTown\":\"\",\"receiverZip\":\"\",\"refAid\":\"313001208133750610\",\"refOid\":\"4181722704291751006\",\"refPlatform\":\"TB\",\"refType\":\"TMALL\",\"refundCreateTime\":1735287358000,\"refundFee\":\"98.86\",\"refundPhase\":\"ON_SALE\",\"refundTime\":1735289443000,\"refundUpdateTime\":1735289443000,\"refundVersion\":1735287358100,\"senderAddress\":\"\",\"senderCity\":\"\",\"senderCountry\":\"中国\",\"senderDistrict\":\"\",\"senderMobile\":\"\",\"senderName\":\"\",\"senderPhone\":\"\",\"senderState\":\"\",\"senderTown\":\"\",\"senderZip\":\"\",\"status\":\"SUCCESS\",\"statusCode\":\"SUCCESS\",\"statusName\":\"退款成功\",\"totalFee\":\"98.86\",\"type\":\"REFUND\",\"updateTime\":1735289479000}}");
 
             //string result = designHelper.API_CheckOrderTo("12123123123132", "456456465465");
@@ -4086,7 +4086,7 @@ namespace SiteCore.Handler
 
                     if (entity.OrderState == 6 || entity.IsHaveNewOrder == 2)
                     {
-                        message = "订单有被点击下载。请注意沟通是否已下载完！";
+                        message = eid + "订单有被点击下载。请注意沟通是否已下载完！";
                         isDown = "被点击下载";
                     }
                     if (CurrentUser.UserPost.Post.Code != "Supplier")//不是供应商打回
@@ -8840,7 +8840,7 @@ namespace SiteCore.Handler
             string buyernick = GetPostString("buyer_nick");
             if (buyernick.Length > 0) lw.Add(string.Format("buyer_nick like '%{0}%'", buyernick));
             string customer = GetPostString("customer");
-            if (customer.Length > 0) lw.Add(string.Format("CustomerTb like '%{0}%'", customer));
+            if (customer.Length > 0) lw.Add(string.Format("CustomerUserName = '{0}'", customer));
             string design = GetPostString("design");
             if (design.Length > 0) lw.Add(string.Format("DesignUserName like '%{0}%'", design));
             string sellermemo = GetPostString("seller_memo");
@@ -8922,19 +8922,22 @@ namespace SiteCore.Handler
 
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());
             DataTable dt = WebCache.GetData("view_ErpTradeRefund", dStruct);
-            dt.Columns.Add("refund_fees");
-            foreach (DataRow dr in dt.Rows)
+            if (dt != null)
             {
-                String status = dr["status"].ToString();
-                if (status.Equals("SUCCESS") || status.Equals("REFUNDED"))
-                {
-                    dr["refund_fees"] = dr["refund_fee"];
-                }
-                else
+                dt.Columns.Add("refund_fees");
+                foreach (DataRow dr in dt.Rows)
                 {
-                    dr["refund_fees"] = "0.0";
-                }
+                    String status = dr["status"].ToString();
+                    if (status.Equals("SUCCESS") || status.Equals("REFUNDED"))
+                    {
+                        dr["refund_fees"] = dr["refund_fee"];
+                    }
+                    else
+                    {
+                        dr["refund_fees"] = "0.0";
+                    }
 
+                }
             }
             writeGridDataTableJson(dStruct.TotalCount, dt);
         }
@@ -14725,7 +14728,7 @@ namespace SiteCore.Handler
 
                     if (entity.OrderState == 6 || entity.IsHaveNewOrder == 2)
                     {
-                        message = "订单有被点击下载。请注意沟通是否已下载完！";
+                        message = eid + "订单有被点击下载。请注意沟通是否已下载完！";
                         isDown = "被点击下载";
                     }
                     bool isPlace = false;

SiteCore/Handler/sync.orderReport.cs

@@ -471,7 +471,7 @@ namespace SiteCore.Handler
             if (!org.Equals("") && username.Equals(""))
             {
                 StringBuilder sql1 = new StringBuilder();
-                sql1.AppendFormat("SELECT a.did,a.name,sum(a.Refund) AS Refunds ,SUM ( CAST ( a.Amount AS DECIMAL ( 10, 2 ) ) ) AS Amount, SUM(CAST(onFinalizationRate AS decimal(10, 4))) AS totalAmount,SUM ( CAST ( a.AllOrder AS DECIMAL ( 10, 2 ) ) ) AS AllOrder, SUM ( CAST ( a.FinalizationRate AS DECIMAL ( 10, 2 ) ) ) AS FinalizationRate, SUM ( CAST ( a.splitSum AS DECIMAL ( 10, 2 ) ) ) AS splitSum, SUM ( CAST ( a.csplitum AS DECIMAL ( 10, 2 ) ) ) AS csplitum,SUM(CAST(onRefund AS decimal(10, 4))) AS toRefund,(SELECT  COUNT(CONVERT(date, ctime)) AS days FROM [dbo].[Ce_ErpDesignerFinishRateNew] WHERE  did =  a.did and AllOrder > 0  and ctime BETWEEN '{0}' AND '{1}')AS msum FROM [dbo].[Ce_ErpDesignerFinishRateNew]  as a LEFT JOIN view_ErpUser u ON a.did = u.id  WHERE ctime BETWEEN '{0}' AND '{1}' AND u.OrgID = '{2}' GROUP BY a.did,a.name", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                sql1.AppendFormat("SELECT a.did,a.name,sum(a.Refund) AS Refunds ,SUM ( CAST ( a.Amount AS DECIMAL ( 10, 2 ) ) ) AS Amount, SUM(CAST(onFinalizationRate AS decimal(10, 4))) AS totalAmount,SUM ( CAST ( a.AllOrder AS DECIMAL ( 10, 2 ) ) ) AS AllOrder, SUM ( CAST ( a.FinalizationRate AS DECIMAL ( 10, 2 ) ) ) AS FinalizationRate, SUM ( CAST ( a.splitSum AS DECIMAL ( 10, 2 ) ) ) AS splitSum, SUM ( CAST ( a.csplitum AS DECIMAL ( 10, 2 ) ) ) AS csplitum,SUM(CAST(onRefund AS decimal(10, 4))) AS toRefund,(SELECT  COUNT(CONVERT(date, ctime)) AS days FROM [dbo].[Ce_ErpDesignerFinishRateNew] WHERE  did =  a.did and AllOrder > 0  and ctime BETWEEN '{0}' AND '{1}')AS msum FROM [dbo].[Ce_ErpDesignerFinishRateNew]  as a INNER JOIN view_ErpUser u ON a.did = u.id  WHERE ctime BETWEEN '{0}' AND '{1}' AND u.OrgID = '{2}' GROUP BY a.did,a.name", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable dt = null;
                 dt = DbHelper.DbConn.ExecuteDataset(sql1.ToString()).Tables[0];
 
@@ -479,19 +479,19 @@ namespace SiteCore.Handler
                 List<string> lw2 = new List<string>();
 
                 StringBuilder sql = new StringBuilder();
-                sql.AppendFormat("SELECT A.DesignUserId AS did,SUM ( CASE WHEN A.FinishDesignTime IS NOT NULL THEN A.payment ELSE 0 END ) AS designPayment,SUM ( A.payment ) AS TotalPayment,SUM (A.RefundFee ) AS refundPayment,COUNT( A.WaitDesignTime) AS waitSum,   \r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' THEN tid ELSE NULL END) AS sumnum,\r\n\t    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' THEN tid ELSE NULL END) AS WaitDesign,  COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' THEN tid ELSE NULL END) AS Designing,\r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' THEN tid ELSE NULL END) AS DesignFinish\r\n\t\t\t\t\t\t\t\t\t\tFROM\r\n\t\t\t\t\t\t\t\t\t\t\tdbo.CE_ErpTradeCell AS A\r\n\t\t\t\t\t\t\t\t\t\t\tLEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID \r\n\t\t\t\t\t\t\t\t\t\tWHERE\r\n\t\t\t\t\t\t\t\t\t\t\tA.WaitDesignTime BETWEEN '{0}' \r\n\t\t\t\t\t\t\t\t\t\t\tAND '{1}' \r\n\t\t\t\t\t\t\t\t\t\t\tAND b.orgid = '{2}' \r\n\t\t\t\t\t\t\t\t\t\t\tAND a.IsSample!= 2 \r\n\t\t\t\t\t\t\t\t\tGROUP BY\r\n\tDesignUserId ", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                sql.AppendFormat("SELECT A.DesignUserId AS did,SUM ( CASE WHEN A.FinishDesignTime IS NOT NULL THEN A.payment ELSE 0 END ) AS designPayment,SUM ( A.payment ) AS TotalPayment,SUM (A.RefundFee ) AS refundPayment,COUNT( A.WaitDesignTime) AS waitSum,   \r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' THEN tid ELSE NULL END) +  COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' THEN tid ELSE NULL END) AS sumnum,\r\n\t    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' THEN tid ELSE NULL END) AS WaitDesign,  COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' THEN tid ELSE NULL END) AS Designing, COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' THEN tid ELSE NULL END) +  COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' THEN tid ELSE NULL END) AS DesignFinish FROM dbo.CE_ErpTradeCell AS A INNER JOIN dbo.CE_ErpUserPost AS B ON A.DesignUserId = B.UserID WHERE A.WaitDesignTime BETWEEN '{0}' AND '{1}' AND b.orgid = '{2}' AND a.IsSample!= 2  GROUP BY DesignUserId ", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable dt2 = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];
 
                 //获取月周定稿
                 StringBuilder sql3 = new StringBuilder();
                 /*   sql3.AppendFormat("SELECT a.did,b.name, SUM(CAST(a.onFinalizationRate AS decimal(10, 4))) AS totalAmount,(SELECT  COUNT(CONVERT(date, ctime)) AS days\r\nFROM [dbo].[Ce_ErpDesignerFinishRateNew]\r\nWHERE  did =  a.did and AllOrder > 0  and ctime BETWEEN '{0}' AND '{1}')AS msum FROM [dbo].[Ce_ErpDesignerFinishRateNew]  as a LEFT JOIN CE_ErpUser as b on a.did = b.id WHERE a.ctime BETWEEN '{0}' AND '{1}' and a.orgid = '{2}'   GROUP BY a.did,b.name", firstweek.ToString("yyyy-MM-dd HH:mm:ss"), lastweek.ToString("yyyy-MM-dd HH:mm:ss"), org);*/
-                sql3.AppendFormat("SELECT A.DesignUserId AS did, COUNT(CASE WHEN a.WaitDesignTime is not null THEN 1 END) AS WaitDesign, COUNT(CASE WHEN A.OrderState >= '5'  and a.IsRefund !='2' and a.FinishDesignTime  BETWEEN '{0}' AND '{1}' THEN 1 END) AS DesignFinish FROM dbo.CE_ErpTradeCell  AS A LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID where A.WaitDesignTime BETWEEN '{0}' AND '{1}' and b.orgid = '{2}' and a.IsSample!=2  and a.ctid not like '%S%'  GROUP BY DesignUserId ", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                sql3.AppendFormat("SELECT A.DesignUserId AS did, COUNT(CASE WHEN a.WaitDesignTime is not null THEN 1 END) AS WaitDesign, COUNT(CASE WHEN A.OrderState >= '5'  and a.IsRefund !='2' and a.FinishDesignTime  BETWEEN '{0}' AND '{1}' THEN 1 END) AS DesignFinish FROM dbo.CE_ErpTradeCell  AS A INNER JOIN dbo.CE_ErpUserPost AS B ON A.DesignUserId = B.UserID where A.WaitDesignTime BETWEEN '{0}' AND '{1}' and b.orgid = '{2}' and a.IsSample!=2  and a.ctid not like '%S%'  GROUP BY DesignUserId ", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable dt3 = DbHelper.DbConn.ExecuteDataset(sql3.ToString()).Tables[0];
 
-                string sqlFinish = string.Format("SELECT A.DesignUserId AS did, COUNT ( CASE WHEN a.FinishDesignTime BETWEEN '{0}' AND '{1}' THEN 1 END ) AS DesignFinish  FROM dbo.CE_ErpTradeCell AS A LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID WHERE A.FinishDesignTime BETWEEN '{0}'  AND '{1}' AND b.orgid = '{2}' AND a.IsSample!= 2  AND a.ctid NOT LIKE 'S_%'  GROUP BY DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                string sqlFinish = string.Format("SELECT A.DesignUserId AS did, COUNT ( CASE WHEN a.FinishDesignTime BETWEEN '{0}' AND '{1}' THEN 1 END ) AS DesignFinish  FROM dbo.CE_ErpTradeCell AS A INNER JOIN dbo.CE_ErpUserPost AS B ON A.DesignUserId = B.UserID WHERE A.FinishDesignTime BETWEEN '{0}'  AND '{1}' AND b.orgid = '{2}' AND a.IsSample!= 2  AND a.ctid NOT LIKE 'S_%'  GROUP BY DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable finishDesign = DbHelper.DbConn.ExecuteDataset(sqlFinish).Tables[0];
 
-                string sqlRefund = string.Format("SELECT A.DesignUserId AS did, COUNT ( DISTINCT A.tid ) AS refund FROM dbo.CE_ErpTradeRefund AS C LEFT OUTER JOIN dbo.CE_ErpTradeCell AS A ON c.tid= A.tid LEFT OUTER JOIN dbo.view_ErpUser AS B ON A.DesignUserId = B.ID WHERE A.WaitDesignTime BETWEEN '{0}'  AND '{1}'  AND b.orgid = '{2}'  AND a.IsSample!= 2  AND a.ctid NOT LIKE '%S%' AND A.IsRefund > 0  AND ( C.created < A.FinishDesignTime OR A.FinishDesignTime IS NULL )  GROUP BY A.DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
+                string sqlRefund = string.Format("SELECT A.DesignUserId AS did, COUNT ( DISTINCT A.tid ) AS refund FROM dbo.CE_ErpTradeRefund AS C INNER JOIN dbo.CE_ErpTradeCell AS A ON c.tid= A.tid INNER JOIN dbo.CE_ErpUserPost AS B ON A.DesignUserId = B.UserID WHERE A.WaitDesignTime BETWEEN '{0}'  AND '{1}'  AND b.orgid = '{2}'  AND a.IsSample!= 2  AND a.ctid NOT LIKE '%S%' AND A.IsRefund > 0  AND ( C.created < A.FinishDesignTime OR A.FinishDesignTime IS NULL )  GROUP BY A.DesignUserId", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), org);
                 DataTable refundDesign = DbHelper.DbConn.ExecuteDataset(sqlRefund).Tables[0];
                 Dictionary<object, Dictionary<String, object>> mapweek = new Dictionary<object, Dictionary<String, object>>();
                 foreach (DataRow dr3 in dt3.Rows)
@@ -738,8 +738,6 @@ namespace SiteCore.Handler
                 DataTable dt = null;
                 dt = DbHelper.DbConn.ExecuteDataset(sql1.ToString()).Tables[0];
 
-
-
                 StringBuilder sql = new StringBuilder();
                 sql.AppendFormat("SELECT\r\n    A.DesignUserId AS did,   SUM ( CASE WHEN A.FinishDesignTime IS NOT NULL THEN A.payment ELSE 0 END ) AS designPayment,COUNT( A.WaitDesignTime) AS waitSum,SUM ( A.RefundFee ) AS refundPayment,     CONVERT(date, A.WaitDesignTime) AS days,\r\n    SUM(A.payment) AS TotalPayment,\r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND A.IsSample != 2  THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND A.IsSample != 2   THEN tid ELSE NULL END) AS sumnum,\r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' AND A.IsSample != 2   THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '3' AND A.IsSample != 2   THEN tid ELSE NULL END) AS WaitDesign,\r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' AND A.IsSample != 2   THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState = '4' AND A.IsSample != 2   THEN tid ELSE NULL END) AS Designing,\r\n    COUNT(DISTINCT CASE WHEN ctid NOT LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' AND A.IsSample != 2   THEN tid ELSE NULL END) +\r\n    COUNT(DISTINCT CASE WHEN ctid LIKE 'C%' AND ctid NOT LIKE 'S%' AND OrderState > '4' AND A.IsSample != 2   THEN tid ELSE NULL END) AS DesignFinish\r\nFROM\r\n    dbo.CE_ErpTradeCell AS A\r\nLEFT OUTER JOIN\r\n    dbo.view_ErpUser AS B ON A.DesignUserId = B.ID\r\nWHERE\r\n    A.WaitDesignTime BETWEEN '{0}' AND '{1}'\r\n    AND B.name = '{2}'\r\nGROUP BY\r\n    A.DesignUserId, CONVERT(date, A.WaitDesignTime)\r\nORDER BY\r\n    days ASC", startTime.ToString("yyyy-MM-dd HH:mm:ss"), endTime.ToString("yyyy-MM-dd HH:mm:ss"), username);
                 DataTable dt2 = DbHelper.DbConn.ExecuteDataset(sql.ToString()).Tables[0];

SiteCore/taobao/tmcHelper.cs

@@ -864,6 +864,7 @@ namespace SiteCore
             {
                 trade.IsNew = isNew;
             }
+            trade.Update();
             CeErpTradeCell entity = null;
             entity = CeErpTradeCell.GetByCtid_M(tObj.refOid);
             if (entity == null)

Web/ERefund/RefundTotal.aspx.cs

@@ -10,7 +10,7 @@ public partial class ERefund_RefundTotal : BasePage
         //_selfCheckPermission = true;
         _keyFilterVisible = false;
         _addVisible = false;
-        _filterItem = "order,shop,memo,wang,moeny,responsible_man,refund_time,refundvstate,ispartrefund";
+        _filterItem = "order,shop,memo,wang,cus,moeny,responsible_man,refund_time,refundvstate,ispartrefund";
         _filterDateBtn = false;
     }
 

Web/ERefund/js/RefundTotal.js

@@ -326,9 +326,8 @@ function searchFn() {
     //var s = mini.encode(data);
     //alert(s);
     //form.setIsValid(false);
-    console.log("565656565", data);
     grid.load({
-        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state,refundvstate:s.refundvstate,ispartrefund:s.ispartrefund,
+        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, refundvstate: s.refundvstate, ispartrefund: s.ispartrefund, customer: s.customer,
         date1: s.date1, date2: s.date2, price1: s.price1, price2: s.price2, seller_memo: s.memo, refunddate1: s.refunddate1, refunddate2: s.refunddate2, responsibleman: s.responsibleman
     });
 }