edit

SiteCore/taobao/tmcHelper.cs

@@ -1815,15 +1815,16 @@ namespace SiteCore
             {
                 entity = new CeErpTradeCell();
                 isNull = true;
+                entity.ctid = ctid;
+                //唯一标识
+                entity.OrderSn = ctid;
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entity.OrderSn = orderSn;
+                }
             }
-            entity.ctid = ctid;
-            //唯一标识
-            entity.OrderSn = ctid;
-            string orderSn = dataHelper.getSaleOrderSn();
-            if (orderSn != "")
-            {
-                entity.OrderSn = orderSn;
-            }
+
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             if (entity.ShopId == 0)
@@ -2226,15 +2227,16 @@ namespace SiteCore
             {
                 entity = new CeErpTradeCell();
                 isNull = true;
+                entity.ctid = ctid;
+                //唯一标识
+                entity.OrderSn = ctid;
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entity.OrderSn = orderSn;
+                }
             }
-            entity.ctid = ctid;
-            //唯一标识
-            entity.OrderSn = ctid;
-            string orderSn = dataHelper.getSaleOrderSn();
-            if (orderSn != "")
-            {
-                entity.OrderSn = orderSn;
-            }
+
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             if (entity.ShopId == 0)
@@ -2431,13 +2433,20 @@ namespace SiteCore
                 entity.isDianziOrder = 0;
             }
             entity.ctid = ctid;
-            //唯一标识
-            entity.OrderSn = ctid;
-            string orderSn = dataHelper.getSaleOrderSn();
-            if (orderSn != "")
+            if (string.IsNullOrEmpty(entity.OrderSn))
+            {
+                //唯一标识
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entity.OrderSn = orderSn;
+                }
+            }
+            else
             {
-                entity.OrderSn = orderSn;
+                entity.OrderSn = ctid;
             }
+
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
             string[] acclist = itemMemo.Split('-');
@@ -2601,12 +2610,18 @@ namespace SiteCore
                 entity.isDianziOrder = 0;
             }
             entity.ctid = ctid;
-            //唯一标识
-            entity.OrderSn = ctid;
-            string orderSn = dataHelper.getSaleOrderSn();
-            if (orderSn != "")
+            if (string.IsNullOrEmpty(entity.OrderSn))
+            {
+                //唯一标识
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entity.OrderSn = orderSn;
+                }
+            }
+            else
             {
-                entity.OrderSn = orderSn;
+                entity.OrderSn = ctid;
             }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;
@@ -2956,12 +2971,18 @@ namespace SiteCore
                 ishave = false;
             }
             entity.ctid = ctid;
-            //唯一标识
-            entity.OrderSn = ctid;
-            string orderSn = dataHelper.getSaleOrderSn();
-            if (orderSn != "")
+            if (string.IsNullOrEmpty(entity.OrderSn))
+            {
+                //唯一标识
+                string orderSn = dataHelper.getSaleOrderSn();
+                if (orderSn != "")
+                {
+                    entity.OrderSn = orderSn;
+                }
+            }
+            else
             {
-                entity.OrderSn = orderSn;
+                entity.OrderSn = ctid;
             }
             entity.tid = father.tid;
             entity.SplitTag = splitTag;

Web/ERefund/RefundTotal.aspx

@@ -102,6 +102,7 @@
                 <div field="refund_fees" width="50" align="center" headeralign="center">实际退款金额</div>
                 <div field="IsPartRefund" width="30" align="center" headeralign="center" renderer="partRenderer">是否部分退款</div>
                 <div field="seller_memo" width="100" align="center" headeralign="center">备注</div>
+                <div field="CustomerUserName" width="100" align="center" headeralign="center">客服</div>
                 <%--<div field="OtherMemo" width="100" align="center" headeralign="center">额外备注</div>--%>
                 <div field="status" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>
                 <%--<div field="status" width="50" visible="false" align="center" headeralign="center" >退款状态</div>--%>