|
|
@@ -606,7 +606,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
if (carTouristList.Count > 0)
|
|
|
{
|
|
|
- //#region 未完整
|
|
|
+ //#region load
|
|
|
|
|
|
|
|
|
////车超时费
|
|
|
@@ -622,7 +622,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
//{
|
|
|
// var row = tb.NewRow();
|
|
|
// row["日期"] = x.Key;
|
|
|
- // row["费用"] = x.Sum(x => x.Price);
|
|
|
+ // row["费用"] = x.Sum(x => x.Price * x.Count);
|
|
|
// row["币种"] = x.FirstOrDefault()?.Currency;
|
|
|
// tb.Rows.Add(row);
|
|
|
//});
|
|
|
@@ -643,6 +643,35 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
//var currOp = currOpResult.Code == 0 ? (currOpResult.Data as CurrencyInfo) == null ? 1 : (currOpResult.Data as CurrencyInfo).Rate : 1;
|
|
|
//var cityCurrResult = await _setDataRep.PostCurrencyByDiid(carTouristList[0].DiId, 79, cityPrice.Currency);
|
|
|
//var cityCurr = cityCurrResult.Code == 0 ? (cityCurrResult.Data as CurrencyInfo) == null ? 1 : (cityCurrResult.Data as CurrencyInfo).Rate : 1;
|
|
|
+ //var di = _sqlSugar.Queryable<Grp_DelegationInfo>().First(x => x.Id == dto.DiId);
|
|
|
+
|
|
|
+ //if (di == null)
|
|
|
+ //{
|
|
|
+ // result.Code = -1;
|
|
|
+ // result.Msg = "无该团组信息！";
|
|
|
+ // return result;
|
|
|
+ //}
|
|
|
+
|
|
|
+
|
|
|
+ //if (carExtraList.Count > 0)
|
|
|
+ //{
|
|
|
+ // foreach (var item in carExtraList)
|
|
|
+ // {
|
|
|
+ // groupExtraCostsArr.Add(new Fin_GroupExtraCost
|
|
|
+ // {
|
|
|
+ // Price = item.Price * item.Count,
|
|
|
+ // CreateTime = DateTime.Now,
|
|
|
+ // CreateUserId = dto.CreateUserId,
|
|
|
+ // Coefficient = 1,
|
|
|
+ // DiId = dto.DiId,
|
|
|
+ // PriceCurrency = item.Currency,
|
|
|
+ // PriceName = di.TeamName + "车超时费(地接导入)",
|
|
|
+ // PriceType = 1050,
|
|
|
+ // PriceDt = item.DatePrice.ObjToDate(),
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ //}
|
|
|
+
|
|
|
|
|
|
//if (tb.Rows.Count > 0)
|
|
|
//{
|
|
|
@@ -676,8 +705,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
// Coefficient = 1,
|
|
|
// DiId = dto.DiId,
|
|
|
// PriceCurrency = cityPrice.Currency,
|
|
|
- // PriceName = "",
|
|
|
- // PriceType = 1,
|
|
|
+ // PriceName = di.TeamName + "餐费(地接导入)",
|
|
|
+ // PriceType = 1049,
|
|
|
+ // PriceDt = Convert.ToDateTime(item["日期"]),
|
|
|
// });
|
|
|
|
|
|
// }
|
yuanrf