diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nearbynursingstation/NearbyNursingStationController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nearbynursingstation/NearbyNursingStationController.java index a8ad5a1..c6c4cd1 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nearbynursingstation/NearbyNursingStationController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nearbynursingstation/NearbyNursingStationController.java @@ -61,4 +61,31 @@ public class NearbyNursingStationController extends BaseController { public AjaxResult list(Long nurseStationId, String homeLongitude, String homeLatitude) { return nearbyNursingStationService.selectNursingStationIntroductionList(nurseStationId, homeLongitude, homeLatitude); } + + /** + * 查询附近某个护理站的服务信息列表 + * + * @param nurseStationId 护理站id + * @param nurseClassifyInfoId 护理项目所属分类id + * @return com.xinyilu.nurseapplet.domain.nearbynursingstation.NearbyNursingStationVO + */ + @MobileRequestAuthorization + @GetMapping("/itemList") + public TableDataInfo itemList(Long nurseStationId, Long nurseClassifyInfoId) { + startPage(); + return getDataTable(nearbyNursingStationService.selectNursingStationItemList(nurseStationId, nurseClassifyInfoId)); + } + + /** + * 查询附近某个护理站的产品信息列表 + * + * @param nurseStationId 护理站id + * @return com.xinyilu.nurseapplet.domain.nearbynursingstation.NearbyNursingStationVO + */ + @MobileRequestAuthorization + @GetMapping("/productInformation") + public TableDataInfo productList(Long nurseStationId) { + startPage(); + return getDataTable(nearbyNursingStationService.selectNursingStationProductList(nurseStationId)); + } } diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/INearbyNursingStationService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/INearbyNursingStationService.java index 04e70ea..6f65ea9 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/INearbyNursingStationService.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/INearbyNursingStationService.java @@ -1,10 +1,13 @@ package com.xinelu.applet.service.nearbynursingstation; import com.xinelu.applet.dto.nursestation.NurseStationAppletDTO; +import com.xinelu.applet.vo.goodinfo.GoodInfoAndItemVO; import com.xinelu.applet.vo.nurseclassifyinfo.NurseClassifyInfoVO; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; +import java.util.List; + /** * @author ljh * @version 1.0 @@ -38,4 +41,21 @@ public interface INearbyNursingStationService { * @return com.xinyilu.common.core.domain.AjaxResult */ AjaxResult selectNursingStationIntroductionList(Long nurseStationId, String homeLongitude, String homeLatitude); + + /** + * 获取附近某个护理站产品信息对象 + * + * @param nurseStationId 护理站id + * @param nurseClassifyInfoId 护理项目所属分类id + * @return GoodInfoAndItemVO + **/ + List selectNursingStationItemList(Long nurseStationId, Long nurseClassifyInfoId); + + /** + * 获取附近某个护理站产品信息对象 + * + * @param nurseStationId 护理站id + * @return GoodInfoAndItemVO + **/ + List selectNursingStationProductList(Long nurseStationId); } diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/impl/NearbyNursingStationServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/impl/NearbyNursingStationServiceImpl.java index 447852b..0df0adb 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/impl/NearbyNursingStationServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nearbynursingstation/impl/NearbyNursingStationServiceImpl.java @@ -3,6 +3,7 @@ package com.xinelu.applet.service.nearbynursingstation.impl; import com.xinelu.applet.dto.nursestation.NurseStationAppletDTO; import com.xinelu.applet.mapper.nearbynursingstation.NearbyNursingStationMapper; import com.xinelu.applet.service.nearbynursingstation.INearbyNursingStationService; +import com.xinelu.applet.vo.goodinfo.GoodInfoAndItemVO; import com.xinelu.applet.vo.nearbynursingstation.NearbyNursingStationVO; import com.xinelu.applet.vo.nearbynursingstation.NursingStationAndClassifyVO; import com.xinelu.applet.vo.nearbynursingstation.PoserInfoHomeVO; @@ -12,6 +13,7 @@ import com.xinelu.applet.vo.specialdisease.StationClassifyInfoVO; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.NurseClassifyInfoEnum; +import com.xinelu.common.enums.NurseStationItemShelfStatusEnum; import com.xinelu.common.enums.PoserModuleTypeEnum; import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.manage.domain.nurseclassifyinfo.NurseClassifyInfo; @@ -189,6 +191,29 @@ public class NearbyNursingStationServiceImpl implements INearbyNursingStationSer return AjaxResult.success(nearbyNursingStationVO); } + /** + * 获取附近护理站服务信息对象 + * + * @param nurseStationId 护理站id + * @param nurseClassifyInfoId 护理项目所属分类id + * @return GoodInfoAndItemVO + */ + @Override + public List selectNursingStationItemList(Long nurseStationId, Long nurseClassifyInfoId) { + return nearbyNursingStationMapper.getNurseStationItemList(nurseStationId, nurseClassifyInfoId, NurseStationItemShelfStatusEnum.SHELF.getInfo()); + } + + /** + * 获取附近护理站产品信息对象 + * + * @param nurseStationId 护理站id + * @return GoodInfoVO + */ + @Override + public List selectNursingStationProductList(Long nurseStationId) { + return nearbyNursingStationMapper.getNurseGoodsList(nurseStationId); + } + /** * 通过经纬度获取距离(单位:米) *