|
@@ -213,37 +213,39 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
//卡类型
|
|
|
List<Sys_SetData> BankCard = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.STid == 15 && a.IsDel == 0).ToList();
|
|
|
- List<SetDataInfoView> _BankCard = _mapper.Map<List<SetDataInfoView>>(BankCard);
|
|
|
+ List<SetDataCurrencyInfoView> _BankCard = _mapper.Map<List<SetDataCurrencyInfoView>>(BankCard).Where(s=> (s.Currency ?? "") == "CNY" ).ToList();
|
|
|
|
|
|
//保险名称
|
|
|
- List<Grp_InsuranceCost> _InsuranceCosts=_sqlSugar.Queryable<Grp_InsuranceCost>().Where(a=>a.IsDel==0).ToList();
|
|
|
- List<InsuranceCostView> insuranceCostViews = new List<InsuranceCostView>();
|
|
|
- foreach (var item in _InsuranceCosts)
|
|
|
- {
|
|
|
- InsuranceCostView costView=new InsuranceCostView();
|
|
|
- costView.Id=item.Id;
|
|
|
- costView.GName=item.GName;
|
|
|
- costView.Balance = 0.00M;
|
|
|
- string CountSql = string.Format(@"select sum(InsuranceCosts) as CountCost from Grp_Customers where isdel=0 and Iid=" + item.Id);
|
|
|
- DataCountCost dataCount = _sqlSugar.SqlQueryable<DataCountCost>(CountSql).First();
|
|
|
- costView.Balance = Math.Round(item.RechargeCost - dataCount.CountCost, 2);
|
|
|
- insuranceCostViews.Add(costView);
|
|
|
- }
|
|
|
+ //List<Grp_InsuranceCost> _InsuranceCosts=_sqlSugar.Queryable<Grp_InsuranceCost>().Where(a=>a.IsDel==0).ToList();
|
|
|
+ //List<InsuranceCostView> insuranceCostViews = new List<InsuranceCostView>();
|
|
|
+ //foreach (var item in _InsuranceCosts)
|
|
|
+ //{
|
|
|
+ // InsuranceCostView costView=new InsuranceCostView();
|
|
|
+ // costView.Id=item.Id;
|
|
|
+ // costView.GName=item.GName;
|
|
|
+ // costView.Balance = 0.00M;
|
|
|
+ // string CountSql = string.Format(@"select sum(InsuranceCosts) as CountCost from Grp_Customers where isdel=0 and Iid=" + item.Id);
|
|
|
+ // DataCountCost dataCount = _sqlSugar.SqlQueryable<DataCountCost>(CountSql).First();
|
|
|
+ // costView.Balance = Math.Round(item.RechargeCost - dataCount.CountCost, 2);
|
|
|
+ // insuranceCostViews.Add(costView);
|
|
|
+ //}
|
|
|
//币种
|
|
|
- GeneralTeamRateInfoDto PostGroupTeamRatedto = new GeneralTeamRateInfoDto();
|
|
|
- PostGroupTeamRatedto.DiId = dto.DiId;
|
|
|
- PostGroupTeamRatedto.CTable = 82;
|
|
|
- PostGroupTeamRatedto.PortType = dto.PortType;
|
|
|
- Result teamRateDescAddCurrencyIdViews = _hotel.PostGroupTeamRateByDiIdAndCTableId(PostGroupTeamRatedto);
|
|
|
+ //GeneralTeamRateInfoDto PostGroupTeamRatedto = new GeneralTeamRateInfoDto();
|
|
|
+ //PostGroupTeamRatedto.DiId = dto.DiId;
|
|
|
+ //PostGroupTeamRatedto.CTable = 82;
|
|
|
+ //PostGroupTeamRatedto.PortType = dto.PortType;
|
|
|
+ //Result teamRateDescAddCurrencyIdViews = _hotel.PostGroupTeamRateByDiIdAndCTableId(PostGroupTeamRatedto);
|
|
|
List<TeamRateDescAddCurrencyIdView> Currency = new List<TeamRateDescAddCurrencyIdView>();
|
|
|
- if (teamRateDescAddCurrencyIdViews.Code == 0)
|
|
|
- {
|
|
|
- Currency = teamRateDescAddCurrencyIdViews.Data;
|
|
|
- }
|
|
|
-
|
|
|
+ TeamRateDescAddCurrencyIdView cny = new TeamRateDescAddCurrencyIdView() { CurrencyCode = "CNY", CurrencyId = 836, CurrencyName = "人民币", Rate = 1 }; //保险修改,只要人民币
|
|
|
+ Currency.Add(cny);
|
|
|
+ //if (teamRateDescAddCurrencyIdViews.Code == 0)
|
|
|
+ //{
|
|
|
+ // Currency = teamRateDescAddCurrencyIdViews.Data;
|
|
|
+ //}
|
|
|
+
|
|
|
+ //insuranceCost = insuranceCostViews,
|
|
|
var data = new
|
|
|
{
|
|
|
- insuranceCost= insuranceCostViews,
|
|
|
Payment = _Payment,
|
|
|
CurrencyList = Currency,
|
|
|
BankCard = _BankCard,
|