diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 385e634a7..1e8dc93f5 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -136,6 +136,9 @@ public class SpringBootTestController { @Autowired private PileMsgRecordService pileMsgRecordService; + @Autowired + private StationSplitConfigService stationSplitConfigService; + @Autowired private PileStationInfoService pileStationInfoService; @@ -157,9 +160,6 @@ public class SpringBootTestController { @Autowired private MemberService memberService; - @Autowired - private StationSplitConfigService stationSplitConfigService; - @Autowired private OrderService orderService; @@ -3951,4 +3951,11 @@ public class SpringBootTestController { List divMemberList = orderBasicInfoService.calculationOfSplitAmount(stationSplitConfigList, afterSettleOrderDTO, null); System.out.println(JSON.toJSONString(divMemberList)); } + + @Test + public void queryByStationIdTest() { + String stationId = "2"; + List stationSplitConfigs = stationSplitConfigService.queryByStationId(stationId); + System.out.println(JSON.toJSONString(stationSplitConfigs)); + } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java index 39657f815..12ef113b2 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/CacheConstants.java @@ -354,4 +354,9 @@ public class CacheConstants { * 根据桩号查询计费模板 */ public static final String BILLING_TEMPLATE_BY_PILE_SN = "billing_template_by_pile_sn:"; + + /** + * 根据站点id查询分账配置 + */ + public static final String QUERY_STATION_SPLIT_CONFIG = "query_station_split_config:"; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java index 9859c57ed..994f87b29 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/StationSplitConfigServiceImpl.java @@ -1,7 +1,10 @@ package com.jsowell.pile.service.impl; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; +import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.DelFlagEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; @@ -23,6 +26,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.concurrent.TimeUnit; @Service public class StationSplitConfigServiceImpl implements StationSplitConfigService{ @@ -33,9 +37,25 @@ public class StationSplitConfigServiceImpl implements StationSplitConfigService{ @Autowired private AdapayMemberAccountService adapayMemberAccountService; + @Autowired + private RedisCache redisCache; + + /** + * 根据站点ID查询站点分账配置, 加缓存 + * @param stationId + * @return + */ @Override public List queryByStationId(String stationId) { - return stationSplitConfigMapper.queryByStationId(stationId); + String redisKey = CacheConstants.QUERY_STATION_SPLIT_CONFIG + stationId; + List stationSplitConfigs = redisCache.getCacheList(redisKey); + if (CollectionUtils.isEmpty(stationSplitConfigs)) { + stationSplitConfigs = stationSplitConfigMapper.queryByStationId(stationId); + if (CollectionUtils.isNotEmpty(stationSplitConfigs)) { + redisCache.batchSetCacheList(ImmutableMap.of(redisKey, stationSplitConfigs), 30, TimeUnit.MINUTES); + } + } + return stationSplitConfigs; } @Override