diff --git a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AppSettingRepository.java b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AppSettingRepository.java index 7a49e99..20f4a98 100644 --- a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AppSettingRepository.java +++ b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AppSettingRepository.java @@ -3,17 +3,21 @@ package com.hchbox.repository.master; import com.hchbox.entity.master.AppSetting; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author Enzo * @date : 2021/7/2 */ @Repository -public interface AppSettingRepository extends JpaRepository, JpaSpecificationExecutor { +public interface AppSettingRepository extends JpaRepository, JpaSpecificationExecutor { /** * 卖家昵称以及类型查找 + * * @param sellerNick * @param settingType * @return @@ -22,9 +26,21 @@ public interface AppSettingRepository extends JpaRepository, /** * 用户id以及设置类型查找 + * * @param userId * @param settingType * @return */ AppSetting findByUserIdAndType(Long userId, Integer settingType); + + /** + * 类型与状态查找 + * + * @param userId + * @param settingType + * @param oneNumber + * @return + */ + @Query("select a from AppSetting a where a.userId = ?1 and a.type = ?2 and a.status =?3 ") + AppSetting findByUserIdAndTypeAndStatus(Long userId, Integer settingType, int oneNumber); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java index beb316c..8ccff09 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/AppSettingService.java @@ -32,11 +32,13 @@ public interface AppSettingService { /** * 昵称 类型活动设置 + * * @param userId * @param settingType + * @param oneNumber * @return */ - AppSetting getSetting(Long userId, Integer settingType); + AppSetting getSetting(Long userId, Integer settingType, int oneNumber); /** diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java index 5b517be..a7b8bb1 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/AppSettingServiceImpl.java @@ -98,8 +98,8 @@ public class AppSettingServiceImpl implements AppSettingService { @Override @Cacheable(value = "settingCache", key = "#userId+'-'+#settingType") - public AppSetting getSetting(Long userId, Integer settingType) { - return appSettingRepository.findByUserIdAndType(userId, settingType); + public AppSetting getSetting(Long userId, Integer settingType, int oneNumber) { + return appSettingRepository.findByUserIdAndTypeAndStatus(userId, settingType, oneNumber); } @Override diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java index ccaa268..bb8acad 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java @@ -343,7 +343,7 @@ public class TopTradeServiceImpl implements TopTradeService { } // 1. 查询买家是否开启查询 - AppSetting setting = appSettingService.getSetting(sellerAccount.getId(), appSettingTypeEnum.getType()); + AppSetting setting = appSettingService.getSetting(sellerAccount.getId(), appSettingTypeEnum.getType(), DefaultNumberConstants.ONE_NUMBER); if (setting == null || setting.getStatus() == DefaultNumberConstants.ZERO_NUMBER) { log.info(" ==================== the appSetting are not turned on sellerNick as {} ==================== ", message.getSellerNick()); return Boolean.TRUE;