退款流水增加是否已发货状态筛选

Bailun.DC.Services/OrdersServices.cs

@@ -4237,7 +4237,7 @@ namespace Bailun.DC.Services
         /// <param name="orderno">平台订单号</param>
         /// <param name="total">符合条件的记录数</param>
         /// <returns></returns>
-        public List<dc_base_crm_refund> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno, ref int total)
+        public List<dc_base_crm_refund> ListOrderReturn(BtTableParameter parameter, DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno,int? shippingstatus, ref int total)
         {
             var sqlparam = new DynamicParameters();
 
@@ -4368,6 +4368,19 @@ namespace Bailun.DC.Services
                 sqlparam.Add("orderno", orderno);
             }
 
+            if (shippingstatus.HasValue)
+            {
+                if (shippingstatus.Value == 1)
+                {
+                    sql += " and t1.shipping_status!='UnShipping'";
+                }
+                else
+                {
+                    sql += " and t1.shipping_status='UnShipping'";
+                }
+            }
+
+
             if (!string.IsNullOrEmpty(parameter.sort))
             {
                 sql += " order by t1." + parameter.sort + " " + parameter.order;
@@ -4549,7 +4562,7 @@ namespace Bailun.DC.Services
         /// <param name="website"></param>
         /// <param name="orderno"></param>
         /// <returns></returns>
-        public dc_base_crm_refund ListOrderReturnCount(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno)
+        public dc_base_crm_refund ListOrderReturnCount(DateTime? start, DateTime? end, DateTime? paytimestart, DateTime? paytimeend, int? companyid, string platform, string website, string orderno, int? shippingstatus)
         {
             var sqlparam = new DynamicParameters();
 
@@ -4669,6 +4682,19 @@ namespace Bailun.DC.Services
                 sqlparam.Add("orderno", orderno);
             }
 
+            if (shippingstatus.HasValue)
+            {
+                if (shippingstatus.Value == 1)
+                {
+                    sql += " and t1.shipping_status='TotalShipping'";
+                }
+                else
+                {
+                    sql += " and t1.shipping_status='UnShipping'";
+                }
+            }
+
+
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)

Bailun.DC.Web/Areas/Reports/Controllers/OrdersController.cs

@@ -2117,14 +2117,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         }
 
         [BailunAuthentication(LoginMode.Enforce)]
-        public string ListReturnJson(BtTableParameter parameter,DateTime? start,DateTime? end,DateTime? paystart,DateTime? payend,string platform,string website, string orderno)
+        public string ListReturnJson(BtTableParameter parameter,DateTime? start,DateTime? end,DateTime? paystart,DateTime? payend,string platform,string website, string orderno,int? shipstatus)
         {
             var _service = new Services.OrdersServices();
             var companyid = HttpContextHelper.Current?.User?.GetCompanyId().ToInt32();
             var total = 0;
 
-            var obj = _service.ListOrderReturn(parameter, start, end, paystart, payend, companyid, platform, website, orderno, ref total);
-            var countOjb = _service.ListOrderReturnCount(start, end, paystart, payend, companyid, platform, website, orderno);
+            var obj = _service.ListOrderReturn(parameter, start, end, paystart, payend, companyid, platform, website, orderno,shipstatus, ref total);
+            var countOjb = _service.ListOrderReturnCount(start, end, paystart, payend, companyid, platform, website, orderno,shipstatus);
 
             var list = obj.Select(a => new {
                 a.platform_type,

Bailun.DC.Web/Areas/Reports/Views/Orders/ListReturn.cshtml

@@ -28,6 +28,14 @@
                         </select>
                     </div>*@
                     <div class="form-group">
+                        <label>是否已发货</label>
+                        <select id="shipstatus" name="shipstatus" class="form-control">
+                            <option value="">发货状态</option>
+                            <option value="1">已发货</option>
+                            <option value="0">未发货</option>
+                        </select>
+                    </div>
+                    <div class="form-group">
                         <label>付款时间</label>
                         <input id="paystart" name="paystart" type="text" class="form-control" style="width:130px;" value="" placeholder="付款开始时间" />
                         <span>至</span>