From 9ff815f7c083a5990917f12b83e1a60777da704b Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Wed, 20 Mar 2024 12:56:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DesignTimeBuild/.dtbcache.v2 | Bin 300165 -> 300165 bytes .vs/BPA.KitChen.GroupMeal/v17/.futdcache.v2 | Bin 1379 -> 1379 bytes .vs/BPA.KitChen.GroupMeal/v17/.suo | Bin 879104 -> 879104 bytes .../bpa.kitchen.groupmeal.metadata.v7.bin | Bin 291418 -> 291472 bytes .../bpa.kitchen.groupmeal.projects.v7.bin | Bin 10513348 -> 11034716 bytes .../Service/DiningPlateService.cs | 2 +- .../DiningPlate/Dtos/DiningPlateDto.cs | 2 +- .../DiningPlate/Service/DiningPlateService.cs | 53 ++++++++++++++---- 8 files changed, 43 insertions(+), 14 deletions(-) diff --git a/.vs/BPA.KitChen.GroupMeal/DesignTimeBuild/.dtbcache.v2 b/.vs/BPA.KitChen.GroupMeal/DesignTimeBuild/.dtbcache.v2 index 0836f5a5a0314b90a93bde806c00e474d5ee5dad..25996f17c240ec7b8cc4984d76699dfade637aee 100644 GIT binary patch delta 3712 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 JXE=DU>EBtL9-9CF diff --git a/.vs/BPA.KitChen.GroupMeal/v17/.futdcache.v2 b/.vs/BPA.KitChen.GroupMeal/v17/.futdcache.v2 index 69cf6ea1672db39fbcb8b325ed20a24454ccd6fd..54760c3ef6785e38347ede5f58248d86839302f6 100644 GIT binary patch delta 70 zcmaFN^_XiyC+kM5o_nt*_ATH{-~9a6EB8AbQIpRxnoQ1SjAE^cF}w9@@+rnyoR7TS RP~`p9AQJ!p delta 70 zcmaFN^_XiyCu`LNo*MOueG53v=WVM}cfZ3CHTfK)$>eOtDAvm>HEp$s1TCHh*L)VgdjMT^w)# diff --git a/.vs/BPA.KitChen.GroupMeal/v17/.suo b/.vs/BPA.KitChen.GroupMeal/v17/.suo index b589a094ba36b5b3cbba52336353a8085e77acef..b62bc7718306846462fd3a34c11dcdd3c6a2c811 100644 GIT binary patch delta 15527 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 AB>(^b delta 771 zcmZ9KT}abm6vp?y|D)TQ)BUHo>85U#PEE9>^tH%L36oHhgbc;0sF;OzQ#kxcMa&`? zyyOFhSyWzhV?pxwO6?-04@IJ@ZnVuIV!bFObnzZ|&+|OL1BVk_Q9muK;kt2E zr_G)<5$j&2;@y^F)C%3y6^eJhKm>h-q$XpblP9A{rAR!r|BsKyWE3?UoG@>D-&gRubAC>{5&? zcV@J|?wHZFsVio5;}0;ygT*UWg63& z!Aw+UVIz^*%waA`%p;lkEWl0*3t7Zsmf&D1%UI3|RozzuHF$Ss;^riE78Xs3ft z;5K*AxJ!^Oy6NE_z1*jd2R!5v{e&1m=P^%sN|*@Gc+TM4p;5o?{-|2y_hj8~5W{l( zbJeg&h$f03U!$4`c%%q;?IqEHP=!g_oVJ%nsk%En@t^XI+3m`aElPD-z2@)@N?T^@ zYaz2gWRx0&{ELoEp(8TCw$W?Xf=a&(Dxrp6S#GU~+3&uDzZqp-S5a(5Tw#2oZp^M1 z{)||4buw(xbDd3&e`Am7Pt;;psZK^*#Z%@lMej>WEtBb;&FX(-{9K1`=#}^l6X^d9 delta 331 zcmV~$*E$ve007W0{FO)wAt@>=6{6A-O%e)GMkulxNRm<1QAVW{ibC(u19agXy74fb zv+?(LVEx~CV9X{#f`tg!Y>TZzZ4)Nkb`f@nw9_t8qQ%%PR-AZyB-ks_KKms}cECZ0 zq)3$}U53Ll9dXn#S+eCgE?1rtPC6yuX=j{u&UpncC{*O4OD?6S`Ws@+zj)*W}%sn?*z xM!oXdm~n5s#e{d>n>1zGj1NBgWY%Y2%=zk@c?%YO_rsE9KmD>|_0QUR_kTS?ixU6< diff --git a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs index bcb8622..5a15db3 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs @@ -135,7 +135,7 @@ namespace BPA.KitChen.GroupMeal.Application.Service.AExternalPlatform.Service.Di ChipCode = inputDto.ChipCode, GroupId = CurrentUser.TenantId, QRCode = inputDto.QRCode, - IsPay=inputDto.IsPay, + IsPay= inputDto.IsPay, Status = CommonStatus.ENABLE, }).ExecuteCommandAsync(); } diff --git a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Dtos/DiningPlateDto.cs b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Dtos/DiningPlateDto.cs index b87bc19..faa3d98 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Dtos/DiningPlateDto.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Dtos/DiningPlateDto.cs @@ -35,7 +35,7 @@ namespace BPA.KitChen.GroupMeal.Application.Service.OneCard.DiningPlate.Dtos /// public string ChipCode { get; set; } - public bool IsPay { get; set; } = true; + public bool IsPay { get; set; } } diff --git a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs index a1fff4e..38c2e24 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs @@ -94,7 +94,17 @@ namespace BPA.KitChen.GroupMeal.Application.Service.OneCard.DiningPlate.Service Id = t.Id.SelectAll() }).ToPageList(inputDto.Current, inputDto.PageSize, ref total); - + if (data != null) + { + foreach (var item1 in data) + { + foreach (var item2 in res.Where(item2 => item1.DiningPlateId == item2.Id)) + { + item2.IsOccupy = item1.IsOccupy; + item2.WeighOrderId = item1.WeighOrderId; + } + } + } return new PageUtil() { @@ -120,7 +130,17 @@ namespace BPA.KitChen.GroupMeal.Application.Service.OneCard.DiningPlate.Service }).ToPageList(inputDto.Current, inputDto.PageSize, ref total); - + if (data != null) + { + foreach (var item1 in data) + { + foreach (var item2 in res.Where(item2 => item1.DiningPlateId == item2.Id)) + { + item2.IsOccupy = item1.IsOccupy; + item2.WeighOrderId = item1.WeighOrderId; + } + } + } return new PageUtil() { Data = res, @@ -270,20 +290,29 @@ namespace BPA.KitChen.GroupMeal.Application.Service.OneCard.DiningPlate.Service { var result = new List(); - Dictionary dic = new Dictionary(); - dic.Add("GroupId", CurrentUser.TenantId); - var url = App.Configuration["GroupMealOrderUrl"] + "api/WeighOrder/GetDiningPlateOccupyInfo"; - var inputData = JsonConvert.SerializeObject(inputDto); - var jsonData = HttpHelper.PostData(url, inputData, Encoding.UTF8, "application/json", dic); - var data = JsonConvert.DeserializeObject>>(jsonData); - - if (data.statusCode != 200) + try { - throw Oops.Oh(data.errors); + Dictionary dic = new Dictionary(); + dic.Add("GroupId", CurrentUser.TenantId); + var url = App.Configuration["GroupMealOrderUrl"] + "api/WeighOrder/GetDiningPlateOccupyInfo"; + var inputData = JsonConvert.SerializeObject(inputDto); + var jsonData = HttpHelper.PostData(url, inputData, Encoding.UTF8, "application/json", dic); + var data = JsonConvert.DeserializeObject>>(jsonData); + + if (data.statusCode != 200) + { + throw Oops.Oh(data.errors); + } + return data.data; + } + catch (Exception e) + { + throw Oops.Oh($"内部请求错误"); } + return result; + - return data.data; } ///