autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-05 10:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source
This commit is contained in:
Guoqs
2024-11-06 14:08:52 +08:00
parent d6489a80ee bad30f2847
commit 22ba0c5c63
17 changed files with 411 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -464,10 +464,12 @@ public class PileService {
if (StringUtils.equals(Constants.ONE, type)) {
List<PileMemberRelation> pileMemberRelations = pileMemberRelationService.selectPileMemberRelationByPileSn(dto.getPileSn());
idList = pileMemberRelations.stream().map(PileMemberRelation::getId).collect(Collectors.toList());
// 管理员解绑，需要删除该桩的预约信息
pileReservationInfoService.deleteReservationByPileSn(dto.getPileSn());
}else {
idList.add(pileMemberRelation.getId());
}
return pileMemberRelationService.deleteRelationByIds(idList);
}

8
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -62,6 +62,7 @@ import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.base.MemberWalletVO;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.customer.*;
@@ -309,6 +310,13 @@ public class SpringBootTestController {
}
}
@Test
public void batchSelectConnectorList() {
ArrayList<String> stationIds = Lists.newArrayList("19", "2", "14");
List<ConnectorInfoVO> connectorInfoVOS = pileConnectorInfoService.batchSelectConnectorList(stationIds);
System.out.println(connectorInfoVOS);
}
@Test
public void selectPileConnectorInfoListByPileSnListTest() {
List<String> pileSnList = Lists.newArrayList();