提交成本单据

Mall.Module.Product/OrderModule.cs

@@ -8887,7 +8887,7 @@ namespace Mall.Module.Product
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public bool SetOrderSupplierId(int type, int LivePeopleNum, decimal LiveCommission, List<RB_Goods_OrderDetail_Extend> orderList, int tenantId, int mallBaseId)
+        public bool UpdateOrderDetailLive(int type, int LivePeopleNum, decimal LiveCommission, List<RB_Goods_OrderDetail_Extend> orderList, int tenantId, int mallBaseId)
         {
 
             Dictionary<string, object> keyValues;
@@ -8915,41 +8915,52 @@ namespace Mall.Module.Product
                 return false;
             }
             bool flag = false;
-            foreach (var item in orderList)
+            var trans = goods_OrderDetailRepository.DbTransaction;
+            try
             {
-                List<WhereHelper> wheres1 = new List<WhereHelper>() {
-                new WhereHelper(){
-                        FiledName=nameof(RB_Goods_OrderDetail.Id),
-                        FiledValue=item.Id,
-                        OperatorEnum=OperatorEnum.Equal
-                },
-                new WhereHelper(){
-                        FiledName=nameof(RB_Goods_OrderDetail.TenantId),
-                        FiledValue=tenantId,
-                        OperatorEnum=OperatorEnum.Equal
-                },
-                new WhereHelper(){
-                        FiledName=nameof(RB_Goods_OrderDetail.MallBaseId),
-                        FiledValue=mallBaseId,
-                        OperatorEnum=OperatorEnum.Equal
-                }
-            };
-
-                flag = goods_OrderDetailRepository.Update(keyValues, wheres1);
-                if (flag)
+                foreach (var item in orderList)
                 {
-                    //记录日志
-                    Task.Run(() => goods_LogRepository.Insert(new RB_Goods_Log()
+                    List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                        new WhereHelper(){
+                                FiledName=nameof(RB_Goods_OrderDetail.Id),
+                                FiledValue=item.Id,
+                                OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                                FiledName=nameof(RB_Goods_OrderDetail.TenantId),
+                                FiledValue=tenantId,
+                                OperatorEnum=OperatorEnum.Equal
+                        },
+                        new WhereHelper(){
+                                FiledName=nameof(RB_Goods_OrderDetail.MallBaseId),
+                                FiledValue=mallBaseId,
+                                OperatorEnum=OperatorEnum.Equal
+                        }
+                    };
+
+                    flag = goods_OrderDetailRepository.Update(keyValues, wheres1, trans);
+                    if (flag)
                     {
-                        //Content = "修改订单商品：" + item.GoodsName + "供应商ID:" + SupplierId + ";供应商历史ID:" + orderModel.SupplierId.ToString(),
-                        CreateDate = DateTime.Now,
-                        Id = 0,
-                        MallBaseId = mallBaseId,
-                        SourceId = item.OrderId,
-                        TenantId = tenantId,
-                        Type = 1
-                    }));
+                        //记录日志
+                         goods_LogRepository.Insert(new RB_Goods_Log()
+                        {
+                            Content = "修改订单商品：" + item.GoodsName + ((type == 1 || type == 2) ? ("主播人数：" + LivePeopleNum + "原主播人数：" + item.LivePeopleNum) : "") + ((type == 1 || type == 3) ? ("主播返佣金额：" + LiveCommission + "原佣金：" + item.LiveCommission) : ""),
+                            CreateDate = DateTime.Now,
+                            Id = 0,
+                            MallBaseId = mallBaseId,
+                            SourceId = item.OrderId,
+                            TenantId = tenantId,
+                            Type = 1
+                        },trans);
+                    }
                 }
+                goods_OrderDetailRepository.DBSession.Commit();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "UpdateOrderDetailLive");
+                goods_OrderDetailRepository.DBSession.Rollback("UpdateOrderDetailLive");
+                return false;
             }
 
             return flag;

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1085,7 +1085,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
 
-            bool flag = orderModule.SetOrderSupplierId(Type, LivePeopleNum, LiveCommission, orderDetailsList, req.TenantId, req.MallBaseId);
+            bool flag = orderModule.UpdateOrderDetailLive(Type, LivePeopleNum, LiveCommission, orderDetailsList, req.TenantId, req.MallBaseId);
             if (flag)
             {
                 return ApiResult.Success();

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -388,16 +388,15 @@ namespace Mall.WebApi.Controllers.User
                 decimal totalMonry = 0;
                 if (demodel.IsSelectAll == 0)
                 {
-                    totalMonry = result.Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)) + (x.FreightCostMoney ?? 0));
+                    totalMonry = (result.Where(x => x.FinanceType == 1).Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)))) + (result.Where(x => x.FinanceType == 2).Sum(x => x.FreightCostMoney ?? 0));
                 }
                 else if (demodel.IsSelectAll == 1)
                 {
-                    totalMonry = result.Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)));
-
+                    totalMonry = result.Where(x => x.FinanceType == 1).Sum(x => ((x.CostMoney ?? 0) * (x.Number ?? 0)));
                 }
                 else if (demodel.IsSelectAll == 2)
                 {
-                    totalMonry = result.Sum(x => (x.FreightCostMoney ?? 0));
+                    totalMonry = result.Where(x => x.FinanceType == 2).Sum(x => (x.FreightCostMoney ?? 0));
                 }
                 var financeObj = new
                 {