Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/User/RB_Distributor_Remit.cs

@@ -167,5 +167,9 @@ namespace Mall.Model.Entity.User
         /// 提现关联订单id
         /// </summary>
         public string ReOrderIds { get; set; }
+        /// <summary>
+        /// 关联的订单号描述
+        /// </summary>
+        public string ReOrderNos { get; set; }
     }
 }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -258,5 +258,17 @@ left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and o
             string sql = $@"SELECT * FROM rb_goods_ordercommission oc WHERE oc.CommissionState=2 and oc.UserId={UserId} and oc.IsRemit <> 1";
             return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取已标记提现的佣金列表
+        /// </summary>
+        /// <param name="UserId"></param>
+        /// <param name="OrderIds"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderCommission_Extend> GetUserCommissionRemitedList(int UserId,string OrderIds)
+        {
+            string sql = $@"SELECT * FROM rb_goods_ordercommission oc WHERE oc.CommissionState=2 and oc.UserId={UserId} and oc.OrderId in ({OrderIds}) and oc.IsRemit = 1";
+            return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
+        }
     }
 }