提交代码

Mall.Module.Product/FinanceModule.cs

@@ -236,7 +236,7 @@ namespace Mall.Module.Finance
 
 
         #region 财务记录
-        public bool SetFinanceRecord(RB_Finance_Record_Extend model)
+        public bool SetFinanceRecord(RB_Finance_Record_Extend model, List<Model.Extend.Product.RB_Goods_OrderDetail_Extend> list )
         {
             bool flag = false;
             var trans = financeRecordRepository.DbTransaction;
@@ -251,16 +251,41 @@ namespace Mall.Module.Finance
                     {
                         model.RecordDetailList.ForEach(x => x.RecordId = recordId);
                         model.RecordDetailList.ForEach(x => x.FinanceId = model.FinanceId);
+                        
                         financeRecordDetailRepository.InsertBatch(model.RecordDetailList, trans);
                     }
 
                     foreach (var item in model.RecordDetailList)
                     {
-                        Dictionary<string, object> keyValues = new Dictionary<string, object>()
+                        Dictionary<string, object> keyValues = new Dictionary<string, object>();
+
+                        if (list.Any(x=>x.Id==item.OrderDetailId && x.FinanceType==1)&& list.Any(x => x.Id == item.OrderDetailId && x.FinanceType == 2))
+                        {
+                            keyValues = new Dictionary<string, object>()
+                            {
+                                { nameof(RB_Goods_OrderDetail.CostFinanceId),model.FinanceId},
+                                { nameof(RB_Goods_OrderDetail.FreightFinanceId),model.FinanceId},
+                                  { nameof(RB_Goods_OrderDetail.PaidCostMoney),item.OrderDetailPaid}
+                            };
+                        }
+                        else if (list.Any(x => x.Id == item.OrderDetailId && x.FinanceType == 1))
+                        {
+                            keyValues = new Dictionary<string, object>()
                             {
                                 { nameof(RB_Goods_OrderDetail.CostFinanceId),model.FinanceId},
+                              
+                                  { nameof(RB_Goods_OrderDetail.PaidCostMoney),item.OrderDetailPaid}
+                            };
+                        }
+                        else if (list.Any(x => x.Id == item.OrderDetailId && x.FinanceType == 2))
+                        {
+                            keyValues = new Dictionary<string, object>()
+                            {
+                                { nameof(RB_Goods_OrderDetail.FreightFinanceId),model.FinanceId},
+
                                   { nameof(RB_Goods_OrderDetail.PaidCostMoney),item.OrderDetailPaid}
                             };
+                        }
                         List<WhereHelper> whereHelpers = new List<WhereHelper>() { new WhereHelper()
                                 {
                                     FiledName=nameof(RB_Finance_Configurine_Extend.Id),

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User
                             result.Add(newOrderGoods);
                         }
                     }
-                    else if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
+                     if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
                     {
                         if (orderGoodsItem.FreightCostMoney.HasValue && orderGoodsItem.FreightCostMoney.Value > 0 && orderGoodsItem.FreightFinanceId <= 0)
                         {
@@ -429,7 +429,7 @@ namespace Mall.WebApi.Controllers.User
                 if (resultCode == "1" && frid > 0)//新增记录
                 {
                     record.FinanceId = frid;
-                    bool addResult = financeModule.SetFinanceRecord(record);
+                    bool addResult = financeModule.SetFinanceRecord(record, result);
                     if (addResult)
                     {
                         return ApiResult.Success("财务单据生成成功");