提交代码

Mall.Model/Query/OrderStatistics_Query.cs

@@ -265,5 +265,10 @@ namespace Mall.Model.Query
         /// </summary>
         public string LiveFinanceIds { get; set; }
 
+        /// <summary>
+        /// 主播数量
+        /// </summary>
+        public int LivePeopleNum { get; set; }
+
     }
 }

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1302,7 +1302,7 @@ GROUP BY od.GoodsId,o.OrderId
             string sql = $@"    SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
 SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
 SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight,
-0 as OtherPrice,e.FXCommission,f.RemitFXCommission,b.LiveCommission,b.LiveFinanceIds,0 as Paid
+0 as OtherPrice,e.FXCommission,f.RemitFXCommission,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid
 from rb_goods_orderdetail as b
 LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
 LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
@@ -1374,7 +1374,7 @@ GROUP BY b.Id order by b.Id desc";
             string sql = $@"      SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
 SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
 SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight,
-0 as OtherPrice,e.FXCommission,f.RemitFXCommission,0 as Paid
+0 as OtherPrice,e.FXCommission,f.RemitFXCommission,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid
 from rb_goods_orderdetail as b
 LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
 LEFT JOIN rb_supplier as f on f.ID=b.SupplierId

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -396,7 +396,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
                         if (item.LiveCommission > 0)
                         {
-                            commissionInfo += (",[主播佣金:" + item.LiveCommission + "]");
+                            commissionInfo += (",[" + item.LivePeopleNum + "位主播佣金:" + item.LiveCommission + "]");
                         }
                         //  commissionInfo = string.Join(",", item.OrderCommissionList.Select(x=>"["+ x.GradeDescription+x.UserName+x.Commission+x.CommissionState==1?"待返":"已返"));
                     }