From 2c54125a6855b569be6ea1ab539898aba217dde1 Mon Sep 17 00:00:00 2001 From: gwbvipvip Date: Mon, 25 Mar 2024 17:45:48 +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 -> 886784 bytes .../bpa.kitchen.groupmeal.metadata.v7.bin | Bin 291472 -> 284963 bytes .../bpa.kitchen.groupmeal.projects.v7.bin | Bin 11034716 -> 11578094 bytes .../CheckService/Services/CheckServices.cs | 2 +- .../Service/Shop/Dtos/StoreDtoOutput.cs | 21 ++++++++++++++ .../Service/Shop/IShopService.cs | 4 ++- .../Service/Shop/ShopService.cs | 27 ++++++++++++++++++ .../Entity/ShopEntity.cs | 3 ++ .../Handlers/RequestAuditFiltercs.cs | 4 +-- .../Properties/launchSettings.json | 2 +- BPA.KitChen.GroupMeal/appsettings.json | 6 ++-- 13 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 BPA.KitChen.GroupMeal.Application/Service/Shop/Dtos/StoreDtoOutput.cs diff --git a/.vs/BPA.KitChen.GroupMeal/DesignTimeBuild/.dtbcache.v2 b/.vs/BPA.KitChen.GroupMeal/DesignTimeBuild/.dtbcache.v2 index 25996f17c240ec7b8cc4984d76699dfade637aee..897e94754925a5295d01cfaf3e1c174cfb681b9f 100644 GIT binary patch delta 4063 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 diff --git a/.vs/BPA.KitChen.GroupMeal/v17/.futdcache.v2 b/.vs/BPA.KitChen.GroupMeal/v17/.futdcache.v2 index 54760c3ef6785e38347ede5f58248d86839302f6..3f7025ddf940b252201348327cb4e92e98513470 100644 GIT binary patch delta 72 zcmaFN^_XiyC)>xJrN;_9C-%?h{L$nOWZmJ2ntYDYWO6oR6q~Yc!O;TG$)_1-a*E2` T05TDh7LzxyNNoPdRKx@TnvotS delta 72 zcmaFN^_XiyC)-A=o_nv{C-%?hOyB(c)+_fr98r_cF`7)yW{hI1i7^9;Og_yxlk<_c S8;YdG*7# diff --git a/.vs/BPA.KitChen.GroupMeal/v17/.suo b/.vs/BPA.KitChen.GroupMeal/v17/.suo index 46dc6f14db151cffaf09179e28d22e1088e656f0..25f264c7ee9f7a71fdc72acf11db9ee648fbe292 100644 GIT binary patch delta 27998 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 diff --git a/.vs/ProjectEvaluation/bpa.kitchen.groupmeal.metadata.v7.bin b/.vs/ProjectEvaluation/bpa.kitchen.groupmeal.metadata.v7.bin index f535cb41062085a4322c742c8a60ef12077616ba..428a1df36edd3f8291fe7b21c207343adc6892ca 100644 GIT binary patch delta 963 zcmYk4ZETZO6vum?bJngv=krv?=2oCv0t`g6zU{3jv@6Si?1jmAvtuB-F$r1Kh+**! z8?vY|skyO#Ga-7CVByN;FlQ%45CJ&2DgQgXjs?`n`2utpSn=}a6g>$``>eZ zH@S%+CUmuYc2U&g|RQR#i58%L4)Ld9%t4m4*F* zP*ut2X;fAmDET6VNZxN4f#XiNJMU&D3@0soy#AmHXiiy zD!4Au1w3+v+SJ9%^f!riGZRAnZPM}hFy+XR12(nb8hJIb7o)eRMTLK&X(9Gu<2~Ak z%Ig&W|CQQbXt8Kdu{|*7S#jf6nuGXnv|Bubf|Fu5+HTNW;(ZK!ORG@)n3#jhzf%;0 zg{DeYHtUK8$PntoK^hkDjMECKFKM(1%hBAdu^*KC7Ig~|yRTT3vP1L_isAb|sa6)g z{PbtHQ>qD!PHN3EIQg)uzeC$KwdODSz$#A2uSO2YsquVu)07t&g{Xwv#q;EyXARWm zvqSdp%~4yYX$h%&Gt|Wh{ip?{yFOng8t0=^=ZIP4VDZ<&2FH+?kA=BxM=rBVUi4MS zV7=?V&}l0lg=eK`z;J=kl{J%>5)yN{1DP|_pn4trruh~aFNy7#e1MapTK239%GC=U zs55v3D~q@R?wf)!GbL>3oEs&Ntb33M#wGF*L#7h%F93|yKbyQ(hW*R1Gs&d#-?vxxP7 zgK|wcFTE;H4K3$x8~T0xs`Jd)Df16mEM%UwP>QG;DuwQ}5T;%qeS;8N^t z zUZ~R7&q^I@<2N$WQhxM~Ygza?#tu;@dop}D49x|^xF)UfV)8kD3U^!io#gYJ_y>^x BN>%^> delta 2129 zcmah~3s96*80FsYvM+h;E)NluhlrXAf@muE0K`m1KvC30VO1o2EdxFV#}pw_DwSym zj+u=#n9Vffvz&h#v#e<<9Zkw7`2dW74l*BS0$GJ;`(Hbf&TdJz7SalUYRz(%3Sh{28!?BL0xL)3^ z@^}r}uJa7!oado1b&v^7l|0nMyq+|ClE3Y$p+enGM)PUAL2>Q*h*}VYP&u3iBTnqv+32Ct<{6N`~2wd{`dZ{$~A9P|1BI>X4s4RZ*A2Hc`BQ zipi8J7f-Yo)?{2Z*d<6R;xAE@W8-VS%BxK@g0pRiYGCuR=Q|#+V?{Ry?k|9Uh?wlC zxEG_a^VG%AdY$jkkXN~xL?HVv^TvvcRK=1Iv77qi+V|Ygl((+1w5-^^x-1Xzd--@o z_>dL$crrLXZnWaKF9jPtG?99NFW0a=1c$TNU9Pn>^MT0fO##}WVpUoMZcL$Ra`Cr> znfm<~ozh(X;D<|OVzuae#Fu0KDISCaL1fjOw83(QM#FrWhO(`$BIRv-oQ7ZNsXWH$ zwzE*Zm?hYIncj3gG)|Qj4{G5f_1yw+ z*dS66=|h1%Wt!tkO6?_@$P#y^%#KZkRy9{pZcvH5KN%}0#~4lMN>3`sAv}lll2Law zGt>ZuAf<&yu`;k=n&L`zZ7}(3SMyx42<2uA#i#*x_SZ*E+~094(W*9r0TZwAK7fH*G#N2lhbHKi>(-j>zmV zN9~+ICFud(W-J3+Ht-4XY2Ze`=Uqp_Fg6Q!qL^9P`j7?^3VdjR`{L@K(wzD(8ia}s ze6xEI`L}31A{)6sp49RX46kL(eoL+c09Q73`B-|zv) zc8EHz9$Spv0n`_VACOUrCNYb#wJzKI%@l}?`*K-U{FbZpVq6cTjT?C%9MTJe(XC{I z%wvuml+5IKf1O@w&lYcQ)}j>4#IZBGaA45fx7{_0@9RdL}b=nMEoh?^8G) zCNN7+kK7;zZ0MA|YVRdB>yXmU^Xj6-0;E_)AEX&YPkvJAa6B-%b_EVuMQD96<>*{3 zhVTH9j_iM!9~PdK5~b0z^bSjMvg@9txNxofdY2)$EflORI$s{nS=3|1s?*5t`Dvt9 z8jOMt9tPhA-lL|fOG_U`}y diff --git a/.vs/ProjectEvaluation/bpa.kitchen.groupmeal.projects.v7.bin b/.vs/ProjectEvaluation/bpa.kitchen.groupmeal.projects.v7.bin index 400de6e4fed21f01cff438f7000103f6d5491214..d5534ab1e77c6bad607e901b6a60a7ac62d7fad6 100644 GIT binary patch delta 548 zcmZXO=`+-E0Eg$dtX*BU>Y-K^2Q&K(SOjG@dodo=kt8le~!yHSAWTkNXW3k7CCk(P-2e*2XMp*XIyZ_ z4R<{7Rq?5sQZjeb9+2n8&HMhv+Hh0M5F8SP}fI>9fr-))o zD5Z=Cl=F~BR8Yxds;H)hTArY#j(QqsL`M_NJmncJJf{^sFEC)FjdnVKPF`Z73p3rk z;x%vRp_jM3qmO;h`jZFF`R@TbD zN_O*Z(!Y&)kzCVKp)#2j7GYKlH1~)i`|1)~@#D|PUmKCwomsU{SXtLDt4s#W!MS?6AEMSQcONCk{%yKKNv`V1sSuaMcIPo?}uu-BU zn{2klR@)>?v0bVi((JTLy4^Bl+GDRQ`|Ni>wj2lLIwViN!;U!WnBxkZP^idBrxZJ_ zM5!|6Dpaa+MztDeol~n$z4I=(s6nGkE^E@PMXM{Wy5_nY+T7IcmfP;Qt3#)I?(5R+ zfrlP>tj80*o_gjvUg+~uzX7iddTq!XZ@u&02OoX%*{~6##(eSBxC!4(nlkOX89)5= L%kMw4^$q_4#qpF) diff --git a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs index 63e0a99..0d673aa 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/CheckService/Services/CheckServices.cs @@ -78,7 +78,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Ser try { Dictionary dic = new Dictionary(); - var url = App.Configuration["GroupMealBaseUrl"] + "api/authorization/GetCompanyById?id="+ tenantId; + var url = App.Configuration["GroupMealBaseUrl"] + "api/authorization/GetCompanyByIdNew?id=" + tenantId; var jsonData = HttpHelper.HttpGet(url, null, dic, "application/json"); var data = JsonConvert.DeserializeObject>(jsonData); if (data.statusCode != 200) throw Oops.Oh(ErrorCodeEnum.Code10016); diff --git a/BPA.KitChen.GroupMeal.Application/Service/Shop/Dtos/StoreDtoOutput.cs b/BPA.KitChen.GroupMeal.Application/Service/Shop/Dtos/StoreDtoOutput.cs new file mode 100644 index 0000000..26034dc --- /dev/null +++ b/BPA.KitChen.GroupMeal.Application/Service/Shop/Dtos/StoreDtoOutput.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BPA.KitChen.GroupMeal.Application.Service.Shop.Dtos +{ + public class StoreDtoOutput + { + public string Id { get; set; } + public string Name { get; set; } + public string OrgId { get; set; } + public string OrgName { get; set; } + public string Phone { get; set; } + public int Sort { get; set; } + public string Description { get; set; } + public string GroupId { get; set; } + public DateTime CreateAt { get; set; } + } +} diff --git a/BPA.KitChen.GroupMeal.Application/Service/Shop/IShopService.cs b/BPA.KitChen.GroupMeal.Application/Service/Shop/IShopService.cs index 852b2a5..6c74aab 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/Shop/IShopService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/Shop/IShopService.cs @@ -1,4 +1,5 @@ -using System; +using BPA.KitChen.GroupMeal.Application.Service.Shop.Dtos; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,5 +9,6 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Shop { public interface IShopService { + Task GetByIdStoreList_alm(string id); } } diff --git a/BPA.KitChen.GroupMeal.Application/Service/Shop/ShopService.cs b/BPA.KitChen.GroupMeal.Application/Service/Shop/ShopService.cs index 2b274af..95750ea 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/Shop/ShopService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/Shop/ShopService.cs @@ -7,6 +7,7 @@ using Furion.DependencyInjection; using Furion.DynamicApiController; using Furion.FriendlyException; using Mapster; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -41,12 +42,38 @@ namespace BPA.KitChen.GroupMeal.Application.Service.Shop }; } + [AllowAnonymous] public async Task> GetAllList() { var data = await SqlSugarDb.Db.Queryable().Where(x=>x.IsDeleted==0).ToListAsync(); return data; } + + /// + /// 根据店铺id查询店铺(外部调用) + /// + /// + /// + [HttpGet("/api/shop/getbyIdstorelist_alm"), AllowAnonymous] + public async Task GetByIdStoreList_alm(string id) + { + string groupId = App.HttpContext.Request.Headers["groupId"].ToString(); + if (string.IsNullOrWhiteSpace(groupId)) throw Oops.Oh("加盟商id不能为空"); + var res = await SqlSugarDb.Db.Queryable().Where(x => x.GroupId == groupId && x.Id == id) + .Select(t => new StoreDtoOutput + { + CreateAt = t.CreateAt, + Id = t.Id, + Name = t.Name, + Phone = t.Phone, + OrgId = t.OrgId, + }).OrderBy(t => t.Sort).OrderBy(x => x.CreateAt, OrderByType.Desc).FirstAsync(); + + return res; + } + + /// /// 新增 /// diff --git a/BPA.KitChen.GroupMeal.Core/Entity/ShopEntity.cs b/BPA.KitChen.GroupMeal.Core/Entity/ShopEntity.cs index 2bcb85b..84e85b7 100644 --- a/BPA.KitChen.GroupMeal.Core/Entity/ShopEntity.cs +++ b/BPA.KitChen.GroupMeal.Core/Entity/ShopEntity.cs @@ -21,5 +21,8 @@ namespace BPA.KitChen.GroupMeal.Core.Entity [SugarColumn(ColumnDataType = "varchar(20)", ColumnDescription = "电话", IsNullable = false)] public string Phone { get; set; } + + [SugarColumn(ColumnDataType = "int", ColumnDescription = "排序", IsNullable = true)] + public int Sort { get; set; } } } diff --git a/BPA.KitChen.GroupMeal/Handlers/RequestAuditFiltercs.cs b/BPA.KitChen.GroupMeal/Handlers/RequestAuditFiltercs.cs index 547e51c..4d3183e 100644 --- a/BPA.KitChen.GroupMeal/Handlers/RequestAuditFiltercs.cs +++ b/BPA.KitChen.GroupMeal/Handlers/RequestAuditFiltercs.cs @@ -87,9 +87,9 @@ namespace BPA.KitChen.GroupMeal.Handlers { foreach (var parameter in parameters) { - var stingA = DtoValidator.GetSign(parameter.Value); + // var stingA = DtoValidator.GetSign(parameter.Value); //var sign = DtoValidator.GetAttributePrice(parameter.Value, "sign"); - await _checkServices.CheckSign(key, stingA, sign); + await _checkServices.CheckSign(key, "stingA", sign); } } diff --git a/BPA.KitChen.GroupMeal/Properties/launchSettings.json b/BPA.KitChen.GroupMeal/Properties/launchSettings.json index db6a487..8ad9930 100644 --- a/BPA.KitChen.GroupMeal/Properties/launchSettings.json +++ b/BPA.KitChen.GroupMeal/Properties/launchSettings.json @@ -14,7 +14,7 @@ "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "api/index.html", - "applicationUrl": "http://localhost:5002", + "applicationUrl": "http://192.168.1.16:5002", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/BPA.KitChen.GroupMeal/appsettings.json b/BPA.KitChen.GroupMeal/appsettings.json index 0d2e912..892d9ae 100644 --- a/BPA.KitChen.GroupMeal/appsettings.json +++ b/BPA.KitChen.GroupMeal/appsettings.json @@ -32,9 +32,9 @@ "UserName": "emqx_u_block", "Password": "emqx_p_admin8765490789" }, - "SAAS_Manage": "http://localhost:5001/", - "GroupMealBaseUrl": "http://localhost:5001/", - "GroupMealOrderUrl": "http://localhost:5003/", + "SAAS_Manage": "http://192.168.1.16:5001/", + "GroupMealBaseUrl": "http://192.168.1.16:5001/", + "GroupMealOrderUrl": "http://192.168.1.16:5003/", "DBConnectionStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmeal;Uid=root;Pwd=cygadmin;", "DBConnectionLogStr": "server=10.2.1.21;Port=3306;Database=bpa_kitchen_groupmeallog;Uid=root;Pwd=cygadmin;", "AllowedHosts": "*"