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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-24 16:10:34 +08:00
parent acb988df79 e93fb47275
commit 7dce806203
8 changed files with 172 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberWalletInfoService.java
View File

@@ -11,6 +11,8 @@ public interface IMemberWalletInfoService {
MemberWalletInfo selectByPrimaryKey(Integer id);
MemberWalletInfo selectByMemberId(String memberId);
int updateByPrimaryKeySelective(MemberWalletInfo record);
int updateByPrimaryKey(MemberWalletInfo record);

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberWalletInfoServiceImpl.java
View File

@@ -33,6 +33,11 @@ public class MemberWalletInfoServiceImpl implements IMemberWalletInfoService {
return memberWalletInfoMapper.selectByPrimaryKey(id);
}
@Override
public MemberWalletInfo selectByMemberId(String memberId) {
return memberWalletInfoMapper.selectByMemberId(memberId);
}
@Override
public int updateByPrimaryKeySelective(MemberWalletInfo record) {
return memberWalletInfoMapper.updateByPrimaryKeySelective(record);

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -619,8 +619,8 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
List<PileInfoVO> pileInfoVOS = queryPileDetailList(stationIdList);
// 对集合根据pileSn进行去重
ArrayList<PileInfoVO> pileInfoList = pileInfoVOS.stream()
.collect(Collectors.collectingAndThen(Collectors.toCollection(()
-> new TreeSet<>(Comparator.comparing(PileInfoVO::getPileSn))), ArrayList::new));
.collect(Collectors.collectingAndThen(Collectors.toCollection(
() -> new TreeSet<>(Comparator.comparing(PileInfoVO::getPileSn))), ArrayList::new));
// 桩总数
generalInfo.setTotalPileQuantity(String.valueOf(pileInfoList.size()));
// 总充电订单数 3.0 --> 3