diff --git a/src/main/java/com/xkrs/dao/BusinessDao.java b/src/main/java/com/xkrs/dao/BusinessDao.java index 8c9edee..4bde171 100644 --- a/src/main/java/com/xkrs/dao/BusinessDao.java +++ b/src/main/java/com/xkrs/dao/BusinessDao.java @@ -56,10 +56,11 @@ public interface BusinessDao extends JpaRepository { */ List findAllByBusinessCountryAndAndBusinessType(String businessCounty, String type); - /**| + /** * 根据商家用户id查询自己的入驻信息 * @param id + * @param businessType * @return */ - BusinessEntity findByBusinessId(Integer id); + BusinessEntity findByBusinessIdAndBusinessType(Integer id,String businessType); } diff --git a/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java b/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java index 037d289..d6d4adb 100644 --- a/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/MerchantSettlementServiceImpl.java @@ -122,7 +122,7 @@ public class MerchantSettlementServiceImpl implements MerchantSettlementService @Override public String findBusinessById(Integer businessId) { Locale locale = LocaleContextHolder.getLocale(); - BusinessEntity byBusinessId = businessDao.findByBusinessId(businessId); + BusinessEntity byBusinessId = businessDao.findByBusinessIdAndBusinessType(businessId,"1"); if(byBusinessId == null){ return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"你还未入驻,请先入驻!",locale); }