From 2503fe82583f018539ab34793ceb3bcbf6c5667a Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 9 Jun 2026 08:47:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=89=AB=E6=8F=8F=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=85=85=E7=94=B5=E6=97=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E4=B8=AA=E4=BA=BA=E6=A1=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/JumpController.java | 2 +- .../java/com/jsowell/service/PileService.java | 19 +- jsowell-admin/src/test/resources/payment_ids | 189 +----------------- .../common/enums/ykc/ReturnCodeEnum.java | 3 +- 4 files changed, 20 insertions(+), 193 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java index d930b23d6..22c83c1b6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java @@ -176,7 +176,7 @@ public class JumpController extends BaseController { memberId = getMemberIdByAuthorization(request); } - AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode); + AppletPileDetailVO vo = pileService.getConnectorDetail(pileConnectorCode, memberId); logger.info("查询充电枪口详情, pileConnectorCode:{}, vo:{}", pileConnectorCode, JSON.toJSONString(vo)); if (StringUtils.isNotBlank(memberId)) { addMember2MemberGroup(memberId, vo); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 318eb45d5..c77f36ab9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -220,7 +220,7 @@ public class PileService { return vo; } - public AppletPileDetailVO getPileDetailByPileSn(String param) throws Exception { + public AppletPileDetailVO getPileDetailByPileSn(String param, String memberId) throws Exception { AppletPileDetailVO vo = null; log.info("查询充电枪口详情-getPileDetailByPileSn, param:{}", param); if (StringUtils.isBlank(param)) { @@ -253,6 +253,19 @@ public class PileService { throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); } + // 判断该桩是否为个人桩 + List memberVOS = pileMemberRelationService.selectMemberList(pileSn); + if (CollectionUtils.isNotEmpty(memberVOS)) { + // 说明为个人桩, 判断会员信息 + // 将memberId收集成list + List memberIdList = memberVOS.stream() + .map(MemberVO::getMemberId) + .collect(Collectors.toList()); + // 如果会员没有绑定该桩，说明没有权限进行操作 + if (!memberIdList.contains(memberId)) { + throw new BusinessException(ReturnCodeEnum.CODE_MEMBER_NOT_HAVE_PILE_PERMISSION); + } + // 查询充电桩下枪口信息 CompletableFuture> connectorInfoListFuture = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.selectConnectorInfoList(pileSn), executor); // log.info("查询充电枪口详情-supplyAsync-selectConnectorInfoList:{}", connectorInfoListFuture); @@ -299,7 +312,7 @@ public class PileService { * @throws ExecutionException * @throws InterruptedException */ - public AppletPileDetailVO getConnectorDetail(String pileConnectorCode) throws Exception { + public AppletPileDetailVO getConnectorDetail(String pileConnectorCode, String memberId) throws Exception { log.info("查询充电枪口详情, pileConnectorCode:{}", pileConnectorCode); PileConnectorDetailVO pileConnectorDetailVO = queryPileConnectorDetail(pileConnectorCode); log.info("查询充电枪口详情, pileConnectorDetailVO:{}", JSON.toJSONString(pileConnectorDetailVO)); @@ -314,7 +327,7 @@ public class PileService { } } String pileSn = pileConnectorDetailVO.getPileSn(); - AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn); + AppletPileDetailVO resultVO = getPileDetailByPileSn(pileSn, memberId); log.info("查询充电枪口详情getConnectorDetail, pileSn:{}, pileConnectorDetailVO:{}, resultVO:{}", pileSn, JSON.toJSONString(pileConnectorDetailVO), JSON.toJSONString(resultVO)); List connectorInfoList = resultVO.getConnectorInfoList(); if (connectorInfoList.size() > 1 && !StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) { diff --git a/jsowell-admin/src/test/resources/payment_ids b/jsowell-admin/src/test/resources/payment_ids index a924a866b..424e33d3e 100644 --- a/jsowell-admin/src/test/resources/payment_ids +++ b/jsowell-admin/src/test/resources/payment_ids @@ -1,188 +1 @@ -002212025121618122710846946041776041984 -002212025123013543010851954554563244032 -002212026010104322810852537890272755712 -002212025112522073210839395053787557888 -002212025120720413410843722075120734208 -002212026010918332710855648635420176384 -002212026012207545810860198996873125888 -002212026010910374210855528908832141312 -002212025111709485410836310070675070976 -002212025112816413110840400174906601472 -002212026013017454210863246761760948224 -002212025113022210510841210404460548096 -002212025111316581810834968580149411840 -002212026012211165810860249831925686272 -002212026010200085610852833959422513152 -002212026012118555110860002926394146816 -002212025121209334710845365961304027136 -002212026012017103710859614052845150208 -002212025120319535010842260512643993600 -002212025121504451010846380494055161856 -002212025120119313110841530122060828672 -002212025122523192310850284773435035648 -002212026013017394110863245248292532224 -002212026012705333310861975346717986816 -002212026012009102510859493208189870080 -002212026012819171110862545009394896896 -002212026020113151710863903484339363840 -002212026010614041510854493722241695744 -002212025122717154010850918016471597056 -002212026010415405910853793291316260865 -002212025120313035610842157357671374848 -002212025120405501810842410617678213120 -002212025100710292810821462377338449920 -002212025090513433510809914813501046784 -002212025121308145310845708494798307328 -002212025102800250710828920431341121536 -002212026011209350810856600323798896640 -002212025093019381810819063779938525184 -002212026012914130110862830851761950720 -002212025102723251810828905377354887168 -002212026011416122610857425084242272256 -002212025103123200410830353610908577792 -002212025092723331010818035721160736768 -002212025112019113210837538826677252096 -002212026010819084710855295138321465344 -002212025102319241310827395154634309632 -002212025102718533110828836980470480896 -002212025121811351210847570843389894656 -002212025112811395410840324268695461888 -002212026011315270810857051297583755264 -002212026011508300810857671132671950848 -002212025121818501810847680341601288192 -002212025122012235910848307895332904960 -002212025111214424910834572096455241728 -002212025101503332310824256769765740544 -002212025101014122910822605665181626368 -002212025123111295910852280573656604672 -002212025122912321410851571464460337152 -002212025122419071810849858946427277312 -002212025121507533010846427888914513920 -002212026011820155110858935895485870080 -002212025121716382410847284757996490752 -002212025102410154910827619533163728896 -002212025111019480710833924154224484352 -002212026012519531010861466899182305280 -002212025121912515310847952530791710720 -002212025091911133110814950481046421504 -002212026010522171010854255381420228608 -002212025121013552310844707021574512640 -002212025091415572210813209974666567680 -002212025111721214310836484421810593792 -002212025090119241010808550972619939840 -002212026012607395310861644753064984576 -002212025090412412210809536768898379776 -002212026011921282510859316542855516160 -002212025092118550910815791429036949504 -002212025121713242610847235944673849344 -002212025092920124510818710059610238976 -002212025101309242410823620330208473088 -002212025090618454910810353263698137088 -002212025111818080810836798092730814464 -002212025110621300210832500248041185280 -002212025122311324710849382174300438528 -002212026012722323510862231793603231744 -002212026010220060610853135235943292928 -002212025111623214410836152237925052416 -002212025110913170210833463344691904512 -002212025112217360210838239567226093568 -002212025111920191110837193462170267648 -002212025102816240010829161740781883393 -002212025101313554710823688625817227264 -002212025092518534110817240611673935872 -002212025120423191310842674587056205824 -002212025102516531010828081920610299904 -002212025101720434410825240839836921856 -002212025101918085910825926669907476480 -002212026012419092410861093500920561664 -002212025091219531510812544559669997568 -002212025123008312910851873263692075008 -002212025100221475910819821189846122496 -002212025112511232110839232941986975744 -002212025121919483610848057399154188288 -002212025092214454610816091056525180928 -002212026020119090710863992529354534912 -002212025111515305510835671363391528960 -002212025112317000010838592887014834176 -002212026010508493510854052147955040256 -002212026010518415810854201223866535936 -002212026011522191510857879786327154688 -002212025091513024210813528407530708992 -002212025103018083310829912829399547904 -002212026011513542310857752731270836224 -002212025100414103310820430849850728448 -002212026012714242210862108933408727040 -002212025121418303510846225829766238208 -002212025100422201910820554104661979136 -002212025122216352810849095961576468480 -002212025091216301410812493470157410304 -002212025110309523010831237547117752320 -002212026011414155910857395779063824384 -002212025110812523510833094804327608320 -002212025092322552810816576681653223424 -002212026010117005410852726238882861056 -002212025091007290010811632489596358656 -002212025100217134710819752185085255680 -002212025101118563210823039533252460544 -002212026010409041510853693449663447040 -002212025100914052510822241499388157952 -002212025100916430710822281184114229248 -002212025122514361110850153105390280704 -002212025101818103810825564697454292992 -002212026010711420210854820320350359552 -002212025111714341610836381885107752960 -002212025110518584710832099797764382720 -002212026010311552410853374135496413184 -002212025122608430110850426617083006976 -002212025122816133210851264768693276672 -002212026020314034410864640454610989056 -002212025120219364610841893827348922368 -002212025120822291510844111562225205248 -002212025100711442310821481231221641216 -002212025100815190010821897628623638528 -002212025092910324910818564115468087296 -002212025121418490310846230476820201472 -002212026010523424310854276910094815232 -002212025100422130310820552276624748544 -002212025112109154310837751268539756544 -002212026011813062010858827804463374336 -002212025091019372610811815805750501376 -002212025121311371710845759431650816000 -002212025092221314710816193237265862656 -002212025122408410510849701355378061312 -002212025112221494110838303398304419840 -002212026011214551110856680867706507264 -002212025123107215410852218142670508032 -002212025083119251510808188859560914944 -002212025092308403010816361524222107648 -002212025121118084510845133170435940352 -002212025091209403510812390376895553536 -002212025112518515910839345842035605504 -002212025101212002610823297209891024896 -002212025112618380410839704729997799424 -002212025091813145810814618655161491456 -002212026011709375210858412953370951680 -002212025112704025110839846863925022720 -002212026011113272010856296374202064896 -002212025102923231610829629641771081728 -002212025110408044010831572796683010048 -002212026012218400210860361332279767040 -002212026010707244110854755555972276224 -002212025092900192010818409727185489920 -002212026012619023510861816557700186112 -002212025102302461410827144007524765696 -002212026012705214410861972373845626880 -002212025121113521510845068621057875968 -002212025112408354410838828369879498752 -002212025123120392310852418836375592960 -002212025122219151210849136159274299392 -002212025092507595610817076088643436544 -002212025122413121010849769573971103744 -002212025121319505510845883657896472576 -002212025120709385910843555330682667009 -002212025122113262310848685986643464192 -002212026011616174010858151177270140928 -002212025091618584210813980384911839232 -002212025102011233010826187014639308800 -002212025121601225210846691971442135040 -002212025090523352110810063740095320064 \ No newline at end of file +002212026052916015810906344811847229440 \ No newline at end of file diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index acfbf2e51..169d15311 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -199,6 +199,8 @@ public enum ReturnCodeEnum { CODE_ALREADY_AN_USER("00400024", "您已经是此充电桩用户, 无需再次绑定"), + CODE_MEMBER_NOT_HAVE_PILE_PERMISSION("00700004", "您没有此桩的权限！"), + /* 个人桩 end */ CODE_THIS_CARNO_HAS_BEEN_BINDING("00500001", "当前车牌号已经绑定，请检查！"), @@ -232,7 +234,6 @@ public enum ReturnCodeEnum { CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定，请检查!"), CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息！"), - ; private String value;