edit

SiteCore/Handler/sync.order.cs

@@ -7874,9 +7874,11 @@ namespace SiteCore.Handler
             string price2 = GetPostString("price2");
             if (price2.Length > 0) lw.Add(string.Format("payment <= '{0}'", price2));
             string ispartrefund = GetPostString("ispartrefund");
-            if (ispartrefund.Length > 0) lw.Add(string.Format("IsPartRefund={0}", ispartrefund));  
+            if (ispartrefund.Length > 0) lw.Add(string.Format("IsPartRefund={0}", ispartrefund));
             string designerorg = GetPostString("designerorg");
             if (designerorg.Length > 0) lw.Add(string.Format("DesOrgID={0}", designerorg));
+            string refundState = GetPostString("refundState");
+            if (refundState.Length > 0) lw.Add(string.Format("restatus='{0}'", refundState));
 
             int myOrgid = CurrentUser.UserPost.OrgID;
             string myOrgCode = CurrentUser.UserPost.Post.Code;
@@ -7906,7 +7908,7 @@ namespace SiteCore.Handler
                 }
             }
 
-            lw.Add("OrderState > 2 and OrderState < 6");
+            lw.Add("OrderState in (3,4,5,9) ");
             dStruct.Order = "created desc";
 
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());

SiteCore/taobao/preSalesHelper.cs

@@ -1357,6 +1357,7 @@ namespace SiteCore.Handler
                                 refund.modified = Convert.ToDateTime(refundOrder.updateTime);
                             }
                             refund.order_status = refundOrder.orderStatus;
+                            refund.status = refundOrder.status;
                             refund.Update();
                             int rstate = commonHelper.getRefundTagByState(refundOrder.status);
                             string rstateWord = commonHelper.getRefundStringByState(refundOrder.status);

Web/EDesign/MyReDesign.aspx.cs

@@ -17,7 +17,7 @@ public partial class EDesign_MyReDesign : BasePage
         _repTitle = "退款列表";
         PmTag = "myReDesign";
         //_selfCheckPermission = true;
-        _filterItem = "order,shop,memo,wang,moeny,responsible_man,refund_time,designer_org";
+        _filterItem = "order,shop,memo,wang,moeny,responsible_man,refund_time,designer_org,refundstate";
         _keyFilterVisible = false;
         _addVisible = false;
     }

Web/EDesign/js/myReDesign.js

@@ -222,7 +222,7 @@ function searchFn() {
     //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, ispartrefund: s.ispartrefund, designerorg: s.designerorg,
+        tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, ispartrefund: s.ispartrefund, designerorg: s.designerorg, refundState: s.refundState,
         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
     });
 }
@@ -261,7 +261,7 @@ function onSearchCheckedChanged(e) {
         stime = timearr[0];
         etime = timearr[1];
         grid.load({
-            tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, ispartrefund: s.ispartrefund, designerorg: s.designerorg,
+            tid: s.tid, shopname: s.shop, buyer_nick: s.ww, design: s.design, orderState: s.state, ispartrefund: s.ispartrefund, designerorg: s.designerorg, refundState: s.refundState,
             refunddate1: stime, refunddate2: etime, price1: s.price1, price2: s.price2, seller_memo: s.memo, responsibleman: s.responsibleman
         });
     }

Web/MasterPage/ErpView.master

@@ -557,6 +557,29 @@
                     <option value="1">设计超时</option>
                 </select>
             </div>
+            <div class="filter_item" id="f_refundstate" runat="server" visible="false">
+                <label>退款状态</label>
+                <select class="mini-combobox inp_middle" name="refundState" id="textRefundState">
+                    <option value=""></option>
+                    <option value="WAIT_SELLER_AGREE">买家已经申请退款，等待卖家同意</option>
+                    <option value="WAIT_BUYER_RETURN_GOODS">卖家已经同意退款 ，等待买家退货</option>
+                    <option value="WAIT_SELLER_CONFIRM_GOODS">买家已经退货，等待卖家确认收货</option>
+                    <option value="SELLER_REFUSE_BUYER">卖家拒绝退款</option>
+                    <option value="CLOSED">退款关闭</option>
+                    <option value="SUCCESS">退款成功</option>
+                    <option value="FAILED">退款失败</option>
+                    <option value="REFUNDING">退款处理中</option>
+                    <option value="EXCHANGE_APPLY">换货待处理</option>
+                    <option value="EXCHANGE_WAIT_OUT_GOODS">待买家退货</option>
+                    <option value="EXCHANGE_WAIT_CONFIRM_OUT_GOODS">买家已退货待收货</option>
+                    <option value="EXCHANGE_CLOSE">换货关闭</option>
+                    <option value="EXCHANGE_SUCCESS">换货成功</option>
+                    <option value="EXCHANGE_WAIT_MODIFY">待买家修改</option>
+                    <option value="EXCHANGE_WAIT_SEND_GOODS">待发出换货商品</option>
+                    <option value="EXCHANGE_WAIT_IN_GOODS">待买家收货</option>
+                    <option value="EXCHANGE_WAIT_REFUND">请退款</option>
+                </select>
+            </div>
             <div class="filter_item" style="float: right;" id="date_filter_btn" runat="server" visible="false">
                 &nbsp;&nbsp;<a id="aSearchDay" checkonclick="true" groupname="search" class="mini-button" oncheckedchanged="onSearchCheckedChanged">本日</a>
                 <a id="aSearchWeek" checkonclick="true" groupname="search" class="mini-button" oncheckedchanged="onSearchCheckedChanged">本周</a>

Web/MasterPage/ErpView.master.cs

@@ -156,6 +156,7 @@ public partial class MasterPage_ErpView : System.Web.UI.MasterPage
                 if (fArr.Contains("isNewSearch")) f_isNewSearch.Visible = true;//
                 if (fArr.Contains("aftersakereason")) f_aftersakereason.Visible = true;//
                 if (fArr.Contains("overtime")) f_overtime.Visible = true;//
+                if (fArr.Contains("refundstate")) f_refundstate.Visible = true;//退款状态
 
             }
             else