|
|
@@ -1909,7 +1909,7 @@ namespace OASystem.API.Controllers
|
|
|
/// <returns></returns>
|
|
|
[HttpPost]
|
|
|
[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
- public async Task<IActionResult> GroupJuHeAPITest(int userId,int groupId)
|
|
|
+ public async Task<IActionResult> GroupJuHeAPITest(int userId, int groupId)
|
|
|
{
|
|
|
|
|
|
//添加默认币种
|
|
|
@@ -24520,9 +24520,35 @@ end as 'country'
|
|
|
if (visa.Any())
|
|
|
{
|
|
|
var visainfo = _sqlSugar.Queryable<Res_VisaFeeStandardDetails>()
|
|
|
+ .LeftJoin<Res_VisaFeeStandard>((x, y) => x.ParentId == y.Id && y.IsDel == 0)
|
|
|
.Where(x => x.IsDel == 0 && visa.Select(x => x.Id).Contains(x.ParentId))
|
|
|
+ .Select((x, y) => new
|
|
|
+ {
|
|
|
+ x.Id,
|
|
|
+ x.ParentId,
|
|
|
+ x.ProvinceId,
|
|
|
+ x.VisaAddress,
|
|
|
+ x.IsVisaOnArrival,
|
|
|
+ x.IsElectronicSign,
|
|
|
+ x.VisaTime,
|
|
|
+ x.IsVisaExemptionLarge,
|
|
|
+ x.LargeVisaPrice,
|
|
|
+ x.LargeAgencyFee,
|
|
|
+ x.IsVisaExemptionSmall,
|
|
|
+ x.SmallVisaPrice,
|
|
|
+ x.SmallAgencyFee,
|
|
|
+ x.NormExtFee,
|
|
|
+ x.UrgExtFee,
|
|
|
+ x.IsUrgent,
|
|
|
+ x.UrgentTime,
|
|
|
+ x.UrgentPrice,
|
|
|
+ x.UrgentPriceDesc,
|
|
|
+ y.FeeType,
|
|
|
+ x.Remark
|
|
|
+ })
|
|
|
.ToList();
|
|
|
- var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id);
|
|
|
+
|
|
|
+ var visaMain = visainfo.FirstOrDefault(x => x.ProvinceId == diparent.Id && x.FeeType == 0);
|
|
|
var visayinsiValue = visainfo.FirstOrDefault(x => x.ParentId == visa.FirstOrDefault(x => x.FeeType == 1)?.Id);
|
|
|
visaCountryInfoArr.Add(new
|
|
|
{
|
yuanrf