素材管理 + 分销订单

Mall.Model/Entity/Product/RB_Material_Info.cs

@@ -117,5 +117,10 @@ namespace Mall.Model.Entity.Product
         /// 删除状态
         /// </summary>
         public int? Status { get; set; }
+
+        /// <summary>
+        /// 文件存储  1腾讯  2阿里
+        /// </summary>
+        public int? PathType { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderCommission_Extend.cs

@@ -24,6 +24,11 @@ namespace Mall.Model.Extend.Product
         /// 订单号
         /// </summary>
         public string OrderNo { get; set; }
+
+        /// <summary>
+        /// 订单类型  2网课订单
+        /// </summary>
+        public int? OrderClassify { get; set; }
         /// <summary>
         /// 用户名称
         /// </summary>

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -223,11 +223,11 @@ where {where} group by oc.OrderDetailId,oc.UserId,oc.Grade,oc.Type order by oc.G
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
             }
 
-            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Type,oc.Grade,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,o.OrderClassify,oc.Type,oc.Grade,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
 FROM RB_Goods_OrderCommission oc
 inner join rb_goods_order o on oc.OrderId = o.OrderId
 left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
-where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type,oc.Grade order by oc.OrderId desc";
+where {where} group by oc.OrderId,o.OrderNo,oc.UserId,o.OrderClassify,oc.Type,oc.Grade order by oc.OrderId desc";
             return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
 
@@ -277,7 +277,7 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type,oc.Grade order by
             }
 
             string sql = $@"
-SELECT o.OrderId,o.OrderNo,o.UserId,o.OrderStatus AS DistrbutionOrderSelectStatus
+SELECT o.OrderId,o.OrderNo,o.UserId,o.OrderClassify,o.OrderStatus AS DistrbutionOrderSelectStatus
       ,IFNULL(oc.Commission,0) AS Commission,oc.Type AS Type,oc.Grade AS Grade,oc.CommissionState AS CommissionState
 FROM rb_goods_order o 
       LEFT JOIN (

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1431,6 +1431,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Commission,
                 x.CommissionState,
                 StatusName = x.DistrbutionOrderSelectStatus == 1 ? "待付款" : x.DistrbutionOrderSelectStatus == 5 ? "已完成" : "已付款",
+                x.OrderClassify,
                 x.TenantId,
                 x.MallBaseId,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -56,6 +56,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.VideoTime,
                 x.WithHeight,
                 x.Recycled,
+                x.PathType,
                 x.TenantId,
                 x.MallBaseId,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""