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

Merge branch 'dev' into feature-integrated_with_JCPP

Browse Source
This commit is contained in:
Guoqs
2025-12-31 16:38:44 +08:00
parent 193470ffb4 7e2f9a4c61
commit 755a823212
10 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
View File

@@ -80,7 +80,7 @@ public interface MemberGroupMapper {
MemberGroupVO queryByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId);
List<MemberVO> queryMemberList(@Param("groupCode") String groupCode);
List<MemberVO> queryMemberList(MemberGroupDTO dto);
MemberGroup selectByGroupCode(String groupCode);

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

@@ -215,4 +215,6 @@ public interface PileStationInfoService {
* @return
*/
PageResponse queryUserFrequentedStation(QueryStationDTO dto);
}

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

@@ -386,7 +386,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
@Override
public List<MemberVO> queryMemberList(MemberGroupDTO dto) {
List<MemberVO> list = memberGroupMapper.queryMemberList(dto.getGroupCode());
if (dto.getGroupCode().isEmpty()){
return null;
}
List<MemberVO> list = memberGroupMapper.queryMemberList(dto);
return list;
}

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -773,6 +773,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
deleteRedisByPileSnOrPileConnectorCode(pileSn, pileConnectorCode);
redisCache.setCacheObject(redisKey, status, CacheConstants.cache_expire_time_6m);
// 异步放缓存
CompletableFuture.runAsync(() -> statusChange(pileConnectorCode), executor);
}

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

@@ -36,7 +36,6 @@ import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
import com.jsowell.pile.vo.uniapp.business.StationOrderQuantityInfoVO;
import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.pile.vo.web.StationSelectVO;
import com.jsowell.system.service.SysDeptService;
@@ -1623,4 +1622,5 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
}
return uniAppQueryStationInfoListV2(dto);
}
}